Imported Debian patch 0.995-1debian/0.995-1

author: Julien BLACHE <jblache@debian.org> 2007-11-22 11:42:18 +0100
committer: Mattia Rizzolo <mattia@mapreri.org> 2014-10-03 14:05:42 +0000
commit: 95475333e13157b2a9b62c57be7c82d99e0c4460 (patch)
tree: 3726327549b591aba1510ff4e56317c12b276243
parent: 0db1f3318701235603f80455d7d1e5c1709e5eb1 (diff)
parent: 41b1173190f702693b0b4fd2654cf2dc28a447f4 (diff)
99 files changed, 9865 insertions, 8766 deletions
diff --git a/configure b/configure
index 16573e5..d6a87f7 100755
--- a/configure
+++ b/configure
@@ -1322,14 +1322,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # version code:
 V_MAJOR=0
-V_MINOR=994
+V_MINOR=995
 
 PACKAGE=xsane
 
 BINPROGS="xsane"
 
 # languages
-ALL_LINGUAS="ca cs da de es fr hu it ja nl pl pt pt_BR ro ru sk sl sr sv vi tr zh zh_CN"
+ALL_LINGUAS="ca cs da de es fi fr hu it ja nl pa pl pt pt_BR ro ru sk sl sr sv vi tr zh zh_CN"
 
 SANE_V_MAJOR=1
 VERSION=${V_MAJOR}.${V_MINOR}
diff --git a/configure.in b/configure.in
index 4f6fa0d..309ea98 100644
--- a/configure.in
+++ b/configure.in
@@ -6,14 +6,14 @@ AC_CONFIG_HEADER(include/config.h)
 
 # version code:
 V_MAJOR=0
-V_MINOR=994
+V_MINOR=995
 
 PACKAGE=xsane
 
 BINPROGS="xsane"
 
 # languages
-ALL_LINGUAS="ca cs da de es fr hu it ja nl pl pt pt_BR ro ru sk sl sr sv vi tr zh zh_CN"
+ALL_LINGUAS="ca cs da de es fi fr hu it ja nl pa pl pt pt_BR ro ru sk sl sr sv vi tr zh zh_CN"
 
 SANE_V_MAJOR=1
 VERSION=${V_MAJOR}.${V_MINOR}
diff --git a/debian/changelog b/debian/changelog
index 3c6bd34..885e45a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xsane (0.995-1) unstable; urgency=low
+
+  * New upstream release.
+    + Enlarged buffer for the "No devices" help text (closes: #442294).
+    + LCMS (color management) support.
+  * debian/patches/11_contect_typo.dpatch:
+    + Removed; merged upstream.
+  * debian/patches/12_pbar_fixes.dpatch:
+    + Removed; fixed upstream with a different fix.
+  * debian/control:
+    + Build-Depends: liblcms1-dev for color management support.
+
+ -- Julien BLACHE <jblache@debian.org>  Thu, 22 Nov 2007 11:42:18 +0100
+
 xsane (0.994-1) experimental; urgency=low
 
   * New upstream beta release.
@@ -10,6 +24,47 @@ xsane (0.993-1) experimental; urgency=low
 
  -- Julien BLACHE <jblache@debian.org>  Tue, 27 Feb 2007 22:22:40 +0100
 
+xsane (0.99+0.991-6) unstable; urgency=low
+
+  * debian/patches/12_pbar_fixes.dpatch:
+    + Added; Reduce progress bar updates/redraws by rounding the progress
+      value. Patch by Joris van Rooij <jrrzz@il.fontys.nl> (closes: #432609).
+  * debian/xsane.desktop:
+    + Remove non-existent "Application" category.
+  * debian/xsane-common.links:
+    + Add an index.html symlink to sane-xsane-doc.html in the HTML doc.
+
+ -- Julien BLACHE <jblache@debian.org>  Fri, 24 Aug 2007 11:37:26 +0200
+
+xsane (0.99+0.991-5) unstable; urgency=low
+
+  * debian/xsane.menu:
+    + Update for the new menu structure.
+
+ -- Julien BLACHE <jblache@debian.org>  Sun, 05 Aug 2007 18:14:18 +0200
+
+xsane (0.99+0.991-4) unstable; urgency=low
+
+  * debian/control:
+    + Remove obsolete Build-Conflicts: libpng10-dev.
+    + Remove obsolete Conflicts/Replaces: xsane-gimp1.{2,3}.
+    + Update browser recommendation.
+    + Improve short description.
+  * debian/rules:
+    + Do not ignore errors from make distclean.
+
+ -- Julien BLACHE <jblache@debian.org>  Thu, 02 Aug 2007 18:15:18 +0200
+
+xsane (0.99+0.991-3) unstable; urgency=low
+
+  * debian/patches/10_broken_links.dpatch:
+    + Added; fix broken links in HTML documentation (closes: #415299).
+  * debian/patches/11_contect_typo.dpatch:
+    + Added; fix "contect" typo in xsane-text.h; original patch by 
+      Martin Pitt <martin.pitt@ubuntu.com> (closes: #420749).
+
+ -- Julien BLACHE <jblache@debian.org>  Fri, 27 Apr 2007 21:46:28 +0200
+
 xsane (0.99+0.991-2) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 6f529d7..94957fc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,15 @@ Section: graphics
 Priority: optional
 Maintainer: Julien BLACHE <jblache@debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.0.0), dpatch, libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libsane-dev (>= 1.0.11-3), zlib1g-dev, gettext, autotools-dev
-Build-Conflicts: libpng10-dev
+Build-Depends: debhelper (>= 5), dpatch, libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, liblcms1-dev, libsane-dev (>= 1.0.11-3), zlib1g-dev, gettext, autotools-dev
 
 Package: xsane
 Section: graphics
 Architecture: any
 Depends: xsane-common (= ${source:Version}), ${shlibs:Depends}
-Recommends: mozilla-browser | www-browser
+Recommends: iceweasel | www-browser
 Suggests: gimp, hylafax-client | mgetty-fax, gv, gocr
-Conflicts: xsane-gimp1.2, xsane-gimp1.3
-Replaces: xsane-gimp1.2, xsane-gimp1.3
-Description: GTK+-based X11 frontend for SANE (Scanner Access Now Easy)
+Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
  xsane can be run as a stand-alone program or through the GIMP image
  manipulation program.  In stand-alone mode, xsane can save an image
  to a file in a variety of image formats, serve as a frontend to a
@@ -35,7 +32,7 @@ Section: graphics
 Architecture: all
 Replaces: xsane
 Recommends: xsane
-Description: GTK+-based X11 frontend for SANE (Scanner Access Now Easy)
+Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
  xsane can be run as a stand-alone program or through the GIMP image 
  manipulation program.  In stand-alone mode, xsane can save an image 
  to a file in a variety of image formats, serve as a frontend to a 
diff --git a/debian/patches/00list b/debian/patches/00list
index 349899e..1c43793 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,4 @@
 02_docviewer
 03_gimp_acquire_menu
+10_broken_links
+
diff --git a/debian/patches/02_docviewer.dpatch b/debian/patches/02_docviewer.dpatch
index 0d402e0..8dd70e8 100644
--- a/debian/patches/02_docviewer.dpatch
+++ b/debian/patches/02_docviewer.dpatch
@@ -23,10 +23,10 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/xsane.h /tmp/dpep-work.2gLqkG/xsane-0.97/src/xsane.h
---- ./src/xsane.h	2005-01-22 16:18:40.000000000 +0100
-+++ /tmp/dpep-work.2gLqkG/xsane-0.97/src/xsane.h	2005-08-28 18:56:38.410683378 +0200
-@@ -231,7 +231,7 @@
+diff -urNad xsane-0.995~/src/xsane.h xsane-0.995/src/xsane.h
+--- xsane-0.995~/src/xsane.h	2007-08-13 09:20:32.000000000 +0200
++++ xsane-0.995/src/xsane.h	2007-11-22 11:24:15.068421579 +0100
+@@ -251,7 +251,7 @@
  # elif defined(HAVE_OS2_H)
  #  define DEFAULT_BROWSER "netscape"
  # else
diff --git a/debian/patches/03_gimp_acquire_menu.dpatch b/debian/patches/03_gimp_acquire_menu.dpatch
index d9832fe..d2b4e82 100644
--- a/debian/patches/03_gimp_acquire_menu.dpatch
+++ b/debian/patches/03_gimp_acquire_menu.dpatch
@@ -23,10 +23,10 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad /scratch/xsane/xsane-0.91/src/xsane-text.h xsane-0.91/src/xsane-text.h
---- /scratch/xsane/xsane-0.91/src/xsane-text.h	2003-01-05 18:05:55.000000000 +0100
-+++ xsane-0.91/src/xsane-text.h	2003-06-03 23:43:49.000000000 +0200
-@@ -726,8 +726,8 @@
+diff -urNad xsane-0.995~/src/xsane-text.h xsane-0.995/src/xsane-text.h
+--- xsane-0.995~/src/xsane-text.h	2007-08-13 09:16:43.000000000 +0200
++++ xsane-0.995/src/xsane-text.h	2007-11-22 11:24:49.170421498 +0100
+@@ -869,8 +869,8 @@
  #define XSANE_GIMP_INSTALL_HELP		_("This function provides access to scanners and other image acquisition devices through the SANE (Scanner Access Now Easy) interface.")
  
  /* Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/" */
diff --git a/debian/patches/10_broken_links.dpatch b/debian/patches/10_broken_links.dpatch
new file mode 100644
index 0000000..8e30119
--- /dev/null
+++ b/debian/patches/10_broken_links.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_broken_links.dpatch by  <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix broken links in HTML documentation.
+
+@DPATCH@
+diff -urNad xsane-0.995~/doc/sane-xsane-doc.html xsane-0.995/doc/sane-xsane-doc.html
+--- xsane-0.995~/doc/sane-xsane-doc.html	2007-03-03 14:11:32.000000000 +0100
++++ xsane-0.995/doc/sane-xsane-doc.html	2007-11-22 11:25:36.385421627 +0100
+@@ -165,8 +165,7 @@
+ <li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
+ <li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
+ <li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
+-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
+-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
++<li><a href="sane-xsane-setup-email-doc.html">Mail setup</a></li>
+ <li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
+ <li><a href="sane-xsane-setup-color-management-doc.html">Color management setup</a></li>
+ </ul>
diff --git a/debian/rules b/debian/rules
index 696e018..7a628fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ endif
 
 autotools: autotools-stamp
 autotools-stamp:
-	-rm -f config.sub config.guess
+	rm -f config.sub config.guess
 	ln -s /usr/share/misc/config.sub config.sub
 	ln -s /usr/share/misc/config.guess config.guess
 	touch autotools-stamp
@@ -54,10 +54,10 @@ real-clean:
 	rm -f autotools-stamp build-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
-	-rm -f config.sub config.guess
-	-rm -f po/*.gmo
+	rm -f config.sub config.guess
+	rm -f po/*.gmo
 
 	dh_clean
 
@@ -130,6 +130,7 @@ binary-indep: build install
 	dh_installman -i
 #	dh_installinfo -i
 	dh_installchangelogs -i
+	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -146,15 +147,12 @@ binary-arch: build install
 	dh_installmenu -a
 	dh_installman -a
 #	dh_installinfo -a
-#	dh_undocumented -a
 	dh_installchangelogs -a xsane.CHANGES
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
-#	dh_makeshlibs -a
 	dh_installdeb -a
-#	dh_perl -a
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a 
diff --git a/debian/xsane-common.links b/debian/xsane-common.links
new file mode 100644
index 0000000..00c171b
--- /dev/null
+++ b/debian/xsane-common.links
@@ -0,0 +1 @@
+usr/share/doc/xsane-common/html/sane-xsane-doc.html usr/share/doc/xsane-common/html/index.html
diff --git a/debian/xsane.desktop b/debian/xsane.desktop
index df5c05d..c320bc5 100644
--- a/debian/xsane.desktop
+++ b/debian/xsane.desktop
@@ -14,5 +14,5 @@ Exec=xsane
 Icon=xsane
 Terminal=false
 Type=Application
-Categories=GTK;Application;Graphics;RasterGraphics;Scanning;OCR;
+Categories=GTK;Graphics;RasterGraphics;Scanning;OCR;
 StartupNotify=true
diff --git a/debian/xsane.menu b/debian/xsane.menu
index 1a6d35d..76ef029 100644
--- a/debian/xsane.menu
+++ b/debian/xsane.menu
@@ -1,6 +1,6 @@
 ?package(xsane):command="/usr/bin/xsane" needs="X11" \
-	        section="Apps/Graphics" title="xsane" \
+	        section="Applications/Graphics" title="XSane" \
                 icon="/usr/share/pixmaps/xsane.xpm" \
-		description="xsane provides a graphical \
+		description="XSane provides an advanced graphical \
 		user interface to control an image acquisition device \
 		such as a flatbed scanner or a camera."
diff --git a/doc/xsane-setup-color-management.jpg b/doc/xsane-setup-color-management.jpg
index 01757a9..841cb92 100644
--- a/doc/xsane-setup-color-management.jpg
+++ b/doc/xsane-setup-color-management.jpg
diff --git a/doc/xsane-setup-copy.jpg b/doc/xsane-setup-copy.jpg
index 58c45d8..b760e71 100644
--- a/doc/xsane-setup-copy.jpg
+++ b/doc/xsane-setup-copy.jpg
diff --git a/doc/xsane-setup-display.jpg b/doc/xsane-setup-display.jpg
index cc0199f..f9aba97 100644
--- a/doc/xsane-setup-display.jpg
+++ b/doc/xsane-setup-display.jpg
diff --git a/doc/xsane-setup-email.jpg b/doc/xsane-setup-email.jpg
index 1a5515b..d82432e 100644
--- a/doc/xsane-setup-email.jpg
+++ b/doc/xsane-setup-email.jpg
diff --git a/doc/xsane-setup-enhancement.jpg b/doc/xsane-setup-enhancement.jpg
index 5819b49..5078d9c 100644
--- a/doc/xsane-setup-enhancement.jpg
+++ b/doc/xsane-setup-enhancement.jpg
diff --git a/doc/xsane-setup-fax.jpg b/doc/xsane-setup-fax.jpg
index ea2dfa5..8ab92ea 100644
--- a/doc/xsane-setup-fax.jpg
+++ b/doc/xsane-setup-fax.jpg
diff --git a/doc/xsane-setup-filetype.jpg b/doc/xsane-setup-filetype.jpg
index cdc8de6..2df4e99 100644
--- a/doc/xsane-setup-filetype.jpg
+++ b/doc/xsane-setup-filetype.jpg
diff --git a/doc/xsane-setup-ocr.jpg b/doc/xsane-setup-ocr.jpg
index ff20752..4787149 100644
--- a/doc/xsane-setup-ocr.jpg
+++ b/doc/xsane-setup-ocr.jpg
diff --git a/doc/xsane-setup-save.jpg b/doc/xsane-setup-save.jpg
index 69470c6..2b071fa 100644
--- a/doc/xsane-setup-save.jpg
+++ b/doc/xsane-setup-save.jpg
diff --git a/include/config.h b/include/config.h
index 3a5ea89..19d3ff2 100644
--- a/include/config.h
+++ b/include/config.h
@@ -99,10 +99,10 @@
 #define PACKAGE "xsane"
 
 /* Define to the version of the distribution.  */
-#define VERSION "0.994"
+#define VERSION "0.995"
 
 /* The concatenation of the strings PACKAGE, "-", and VERSION.  */
-#define XSANE_PACKAGE_VERSION "xsane-0.994"
+#define XSANE_PACKAGE_VERSION "xsane-0.995"
 
 /* Define if you have the __argz_count function.  */
 #define HAVE___ARGZ_COUNT 1
@@ -292,7 +292,7 @@
 #define HAVE_LIBTIFF 1
 
 /* Define if you have liblcms.  */
-/* #undef HAVE_LIBLCMS */
+#define HAVE_LIBLCMS 1
 
 #ifndef HAVE_STRNCASECMP
   /* OS/2 needs this */
diff --git a/po/ca.gmo b/po/ca.gmo
index 7253b77..c3f335d 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index 6fae228..867105a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,15 +1,15 @@
 # Catalan translation for XSane.
 # Copyright (C) 2006 Free Software Foundation, Inc.
-# Raül Cambeiro <raulcambeiro@ambtu.bcn.es>, 2006, XSane 0.991
+# Raül Cambeiro <rulet@menta.net>, 2007, XSane 0.995
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: XSane 0.991\n"
+"Project-Id-Version: XSane 0.995\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
-"PO-Revision-Date: 2006-03-02 03:35+0100\n"
-"Last-Translator: Raül Cambeiro <raulcambeiro@ambtu.bcn.es>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
+"PO-Revision-Date: 2007-09-25 03:53+0100\n"
+"Last-Translator: Raül Cambeiro <rulet@menta.net>\n"
+"Language-Team: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -74,16 +74,15 @@ msgid "fax project"
 msgstr "Projecte de fax"
 
 #. WINDOW_FAX_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for fax project"
-msgstr "Introduïu el nom del projecte de fax"
+msgstr "Nom del projecte de fax"
 
 #. WINDOW_FAX_RENAME
 msgid "rename fax page"
 msgstr "Reanomena la pàgina de fax"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+msgid "insert PS-file into fax"
 msgstr "Inseriu un fitxer PS al fax"
 
 #. WINDOW_EMAIL_PROJECT
@@ -91,9 +90,8 @@ msgid "E-mail project"
 msgstr "Projecte de correu electrònic"
 
 #. WINDOW_EMAIL_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for email project"
-msgstr "Introduïu el nom del projecte de correu electrònic"
+msgstr "Nom del projecte de correu electrònic"
 
 #. WINDOW_EMAIL_RENAME
 msgid "rename e-mail image"
@@ -108,9 +106,8 @@ msgid "multipage project"
 msgstr "Projecte multipàgina"
 
 #. WINDOW_MULTIPAGE_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for multipage project"
-msgstr "Projecte multipàgina"
+msgstr "Nom del projecte multipàgina"
 
 #. WINDOW_PRESET_AREA_RENAME
 msgid "rename preset area"
@@ -213,33 +210,28 @@ msgid "No devices available"
 msgstr "No hi ha dispositius disponibles"
 
 #. WINDOW_SCANNER_DEFAULT_COLOR_ICM_PROFILE
-#, fuzzy
 msgid "select scanner default color ICM-profile"
-msgstr "Elimina la impressora"
+msgstr "Seleccioneu el perfil ICM de color predeterminat de l'escàner"
 
 #. WINDOW_SCANNER_DEFAULT_GRAY_ICM_PROFILE
-#, fuzzy
 msgid "select scanner default gray ICM-profile"
-msgstr "Elimina la impressora"
+msgstr "Seleccioneu el perfil ICM de grisos predeterminat de l'escàner"
 
 #. WINDOW_DISPLAY_ICM_PROFILE
 msgid "select display ICM-profile"
-msgstr ""
+msgstr "Seleccioneu el perfil ICM de la pantalla"
 
 #. WINDOW_CUSTOM_PROOFING_ICM_PROFILE
-#, fuzzy
 msgid "select custom proofing ICM-profile"
-msgstr "Seleccioneu el nom del fitxer de sortida"
+msgstr "Seleccioneu el perfil ICM per a proves personalitzades"
 
 #. WINDOW_WORKING_COLOR_SPACE_ICM_PROFILE
-#, fuzzy
 msgid "select working color space ICM-profile"
-msgstr "Elimina la impressora"
+msgstr "Seleccioneu el perfil ICM de l'espai de color amb què treballareu"
 
 #. WINDOW_PRINTER_ICM_PROFILE
-#, fuzzy
 msgid "select printer ICM-profile"
-msgstr "Elimina la impressora"
+msgstr "Seleccioneu el perfil ICM de la impressora"
 
 #. MENU_FILE
 msgid "File"
@@ -277,7 +269,7 @@ msgstr "Geometria"
 #. MENU_COLOR_MANAGEMENT
 #. NOTEBOOK_COLOR_MANAGEMENT_OPTIONS
 msgid "Color management"
-msgstr ""
+msgstr "Gestió del color"
 
 #. MENU_ITEM_ABOUT_XSANE
 msgid "About XSane"
@@ -327,15 +319,15 @@ msgstr "Difumina"
 
 #. MENU_ITEM_ROTATE90
 msgid "Rotate 90"
-msgstr "Rota 90º"
+msgstr "Gira 90º"
 
 #. MENU_ITEM_ROTATE180
 msgid "Rotate 180"
-msgstr "Rota 180º"
+msgstr "Gira 180º"
 
 #. MENU_ITEM_ROTATE270
 msgid "Rotate 270"
-msgstr "Rota 270º"
+msgstr "Gira 270º"
 
 #. MENU_ITEM_MIRROR_X
 msgid "Mirror |"
@@ -502,7 +494,7 @@ msgid "Skip existing filenames"
 msgstr "Omet els noms de fitxer existents"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr "Desa en PostScript comprimit amb zlib (PS nivell 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -510,7 +502,7 @@ msgid "Save PDF zlib compressed"
 msgstr "Desa en PDF comprimit amb zlib"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Desa en format ASCII els PNM de 16 bits"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -522,7 +514,6 @@ msgid "Main window size fixed"
 msgstr "Finestra principal de mida fixa"
 
 #. RADIO_BUTTON_DISABLE_GIMP_PREVIEW_GAMMA
-#, fuzzy
 msgid "Disable GIMP preview gamma"
 msgstr "Inhabilita la previsualització de gamma d'El Gimp"
 
@@ -534,8 +525,8 @@ msgstr "Usa un mapa de colors personal"
 msgid "Autoenhance gamma"
 msgstr "Millora la gamma automàticament"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+msgid "Preselect scan area"
 msgstr "Preselecciona l'àrea d'escaneig"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -549,7 +540,7 @@ msgstr "Usa el conducte de progrés de la interfície gràfica"
 #. RADIO_BUTTON_CMS_BPC
 #. MENU_ITEM_CMS_BLACK_POINT_COMPENSATION
 msgid "Black point compensation"
-msgstr ""
+msgstr "Compensació de punt negre"
 
 #. TEXT_SCANNING_DEVICES
 msgid "scanning for devices"
@@ -559,19 +550,14 @@ msgstr "S'estan cercant els dispositius"
 msgid "Available devices:"
 msgstr "Dispositius disponibles:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Opcions de l'XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Tipus"
 
 #. TEXT_CMS_FUNCTION
 #. DESC_CMS_FUNCTION
-#, fuzzy
 msgid "Color management function"
-msgstr "Tots els colors"
+msgstr "Funció de gestió del color"
 
 #. TEXT_SCANNER_BACKEND
 msgid "Scanner and backend:"
@@ -646,14 +632,13 @@ msgid "16 bit output formats:"
 msgstr "Formats de sortida de 16 bits:"
 
 #. TEXT_REDUCE_16BIT_TO_8BIT
-#, fuzzy
 msgid ""
 "Bit depth 16 bits/channel is not supported for this output format.\n"
 "Do you want to reduce the depth to 8 bits/channel?"
 msgstr ""
-"La profunditat de 16 bits per color no és permesa per a aquest format de "
+"La profunditat de 16 bits per canal no és permesa per a aquest format de "
 "sortida.\n"
-"Voleu reduir la profunditat de color a 8 bits?"
+"Voleu reduir la profunditat de color a 8 bits per canal?"
 
 #. TEXT_AUTHORIZATION_REQ
 msgid "Authorization required for"
@@ -688,9 +673,8 @@ msgid "package"
 msgstr "Paquet:"
 
 #. TEXT_WITH_CMS_FUNCTION
-#, fuzzy
 msgid "with color management function"
-msgstr "Tots els colors"
+msgstr "Amb funció de gestió del color"
 
 #. TEXT_WITH_GIMP_SUPPORT
 msgid "with GIMP support"
@@ -737,7 +721,7 @@ msgstr ""
 "Si el programa tingués algun error, assumireu el cost de totes les "
 "revisions,\n"
 "reparacions o correccions necessàries. Per a usar aquest programa,\n"
-"heu de llegir, entendre i acceptar el següent acord de \"NO GARANTIA\".\n"
+"heu de llegir, entendre i acceptar el següent acord de «NO GARANTIA».\n"
 
 #. TEXT_GPL
 msgid ""
@@ -786,7 +770,7 @@ msgid ""
 msgstr ""
 "Traducció al català\n"
 "de Raül Cambeiro\n"
-"raulcambeiro@ambtu.bcn.es\n"
+"rulet@menta.net\n"
 
 #. TEXT_INFO_BOX
 msgid "0x0: 0KB"
@@ -825,12 +809,12 @@ msgid "Medium Name:"
 msgstr "Nom del mitjà:"
 
 #. TEXT_VIEWER_IMAGE_INFO
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Size %d x %d pixel, %d bits/channel, %d channels, %1.0f dpi x %1.0f dpi, %"
 "1.1f %s"
 msgstr ""
-"Mida %d x %d píxels, %d bits/color, %d colors, %1.0f ppp x %1.0f ppp, %1.1f %"
+"Mida %d x %d píxels, %d bits/canal, %d canals, %1.0f ppp x %1.0f ppp, %1.1f %"
 "s"
 
 #. TEXT_DESPECKLE_RADIUS
@@ -890,70 +874,76 @@ msgstr "Ordre:"
 msgid "Copy number option:"
 msgstr "Opció del nombre de còpies:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+msgid "Scan resolution:"
+msgstr "Resolució de l'escaneig:"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
-msgstr "Resolució en mode línia (ppp):"
+msgid "lineart [dpi]"
+msgstr "línia (ppp)"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
-msgstr "Resolució en escala de grisos (ppp):"
+msgid "grayscale [dpi]"
+msgstr "escala de grisos (ppp)"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Resolució en color (ppp):"
+msgid "color [dpi]"
+msgstr "color [ppp]"
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr "Geometria del paper:"
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+msgid "width"
 msgstr "Amplada"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+msgid "height"
 msgstr "Alçària"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+msgid "left offset"
 msgstr "Marge esquerre"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+msgid "bottom offset"
 msgstr "Marge inferior"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+msgid "Printer gamma:"
+msgstr "Gamma de la impressora:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Valor gamma de la impressora:"
+msgid "common value"
+msgstr "Valor comú"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Gamma per al vermell de la impressora:"
+msgid "red"
+msgstr "Vermell"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Gamma per al verd de la impressora:"
+msgid "green"
+msgstr "Verd"
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Gamma per al blau de la impressora:"
+msgid "blue"
+msgstr "Blau"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
-#, fuzzy
 msgid "Embed scanner ICM profile as CSA"
-msgstr "Elimina la impressora"
+msgstr "Inclou el perfil ICM de l'escàner com a CSA"
 
 #. TEXT_SETUP_PRINTER_EMBED_CRD
-#, fuzzy
 msgid "Embed printer ICM profile as CRD"
-msgstr "Elimina la impressora"
+msgstr "Inclou el perfil ICM de l'escàner com a CRD"
 
 #. TEXT_SETUP_PRINTER_CMS_BPC
 msgid "Apply black point compensation"
-msgstr ""
+msgstr "Aplica compensació de punt negre"
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 "Crea una imatge PostScript comprimida amb zlib (PS nivell 3) per a imprimir"
 
@@ -1077,8 +1067,24 @@ msgstr "Estableix els valors per defecte per a:"
 msgid "Viewer (Postscript):"
 msgstr "Visualitzador (PostScript)"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Amplada"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Alçària"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Marge esquerre"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Marge inferior"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 "Crea una imatge PostScript comprimida amb zlib (PS nivell 3) per als faxos"
 
@@ -1156,37 +1162,33 @@ msgstr "Tothom"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_COLOR_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_COLOR_ICM_PROFILE
-#, fuzzy
 msgid "Scanner default color ICM-profile"
-msgstr "Elimina la impressora"
+msgstr "Perfil ICM de color predeterminat de l'escàner"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_GRAY_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_GRAY_ICM_PROFILE
-#, fuzzy
 msgid "Scanner default gray ICM-profile"
-msgstr "Elimina la impressora"
+msgstr "Perfil ICM de grisos predeterminat de l'escàner"
 
 #. TEXT_SETUP_DISPLAY_ICM_PROFILE
 #. DESC_DISPLAY_ICM_PROFILE
 msgid "Display ICM-profile"
-msgstr ""
+msgstr "Perfil ICM de la pantalla"
 
 #. TEXT_SETUP_CUSTOM_PROOFING_ICM_PROFILE
 #. DESC_CUSTOM_PROOFING_ICM_PROFILE
-#, fuzzy
 msgid "Custom proofing ICM-profile"
-msgstr "Elimina la impressora"
+msgstr "Perfil ICM per a proves personalitzades"
 
 #. TEXT_SETUP_WORKING_COLOR_SPACE_ICM_PROFILE
 #. DESC_WORKING_COLOR_SPACE_ICM_PROFILE
-#, fuzzy
 msgid "Working color space ICM-profile"
-msgstr "Navegueu per a trobar el nom de fitxer de la imatge"
+msgstr "Perfil ICM per a l'espai de color amb què treballareu"
 
 #. TEXT_SETUP_PRINTER_ICM_PROFILE
 #. DESC_PRINTER_ICM_PROFILE
 msgid "Printer ICM-profile"
-msgstr ""
+msgstr "Perfil ICM de la impressora"
 
 msgid "new media"
 msgstr "Nou suport"
@@ -1301,13 +1303,12 @@ msgstr "Mostra la llista de resolucions"
 
 #. MENU_ITEM_PAGE_ROTATE
 msgid "Rotate postscript"
-msgstr "Rota el PostScript"
+msgstr "Gira el PostScript"
 
 #. MENU_ITEM_ENABLE_COLOR_MANAGEMENT
 #. MENU_ITEM_CMS_ENABLE_COLOR_MANAGEMENT
-#, fuzzy
 msgid "Enable color management"
-msgstr "Tots els colors"
+msgstr "Habilita la gestió del color"
 
 #. MENU_ITEM_EDIT_MEDIUM_DEF
 msgid "Edit medium definition"
@@ -1354,84 +1355,76 @@ msgid "Problems?"
 msgstr "Problemes?"
 
 #. MENU_ITEM_CMS_PROOFING
-#, fuzzy
 msgid "Proofing"
-msgstr "Afegeix una impressora"
+msgstr "Proves"
 
 #. SUBMENU_ITEM_CMS_PROOF_OFF
 msgid "no proofing (Display)"
-msgstr ""
+msgstr "Sense proves (pantalla)"
 
 #. SUBMENU_ITEM_CMS_PROOF_PRINTER
-#, fuzzy
 msgid "Proof printer"
-msgstr "Afegeix una impressora"
+msgstr "Impressora per a proves"
 
 #. SUBMENU_ITEM_CMS_PROOF_CUSTOM
 msgid "Proof custom device"
-msgstr ""
+msgstr "Dispositiu per a proves personalitzat"
 
 #. MENU_ITEM_CMS_RENDERING_INTENT
-#, fuzzy
 msgid "Rendering intent"
-msgstr "Afegeix una impressora"
+msgstr "Propòsit de renderització"
 
 #. MENU_ITEM_CMS_PROOFING_INTENT
-#, fuzzy
 msgid "Proofing rendering intent"
-msgstr "Afegeix una impressora"
+msgstr "Prova del propòsit de renderització"
 
 #. SUBMENU_ITEM_CMS_INTENT_PERCEPTUAL
 msgid "Perceptual"
-msgstr ""
+msgstr "Percepció"
 
 #. SUBMENU_ITEM_CMS_INTENT_RELATIVE_COLORIMETRIC
 msgid "Relative colorimetric"
-msgstr ""
+msgstr "Colorimetria relativa"
 
 #. SUBMENU_ITEM_CMS_INTENT_ABSOLUTE_COLORIMETRIC
 msgid "Absolute colorimentric"
-msgstr ""
+msgstr "Colorimetria absoluta"
 
 #. SUBMENU_ITEM_CMS_INTENT_SATURATION
-#, fuzzy
 msgid "Saturation"
-msgstr "Autorització"
+msgstr "Saturació"
 
 #. MENU_ITEM_CMS_GAMUT_CHECK
 msgid "Gamut check"
-msgstr ""
+msgstr "Comprovació de gamma"
 
 #. MENU_ITEM_CMS_GAMUT_ALARM_COLOR
 msgid "Gamut alarm color"
-msgstr ""
+msgstr "Color d'alarma de gamma"
 
 #. SUBMENU_ITEM_CMS_COLOR_BLACK
 msgid "Black"
-msgstr ""
+msgstr "Negre"
 
 #. SUBMENU_ITEM_CMS_COLOR_GRAY
 msgid "Gray"
-msgstr ""
+msgstr "Gris"
 
 #. SUBMENU_ITEM_CMS_COLOR_WHITE
-#, fuzzy
 msgid "White"
-msgstr "escriptura"
+msgstr "Blanc"
 
 #. SUBMENU_ITEM_CMS_COLOR_RED
-#, fuzzy
 msgid "Red"
-msgstr "Redueix"
+msgstr "Vermell"
 
 #. SUBMENU_ITEM_CMS_COLOR_GREEN
 msgid "Green"
-msgstr ""
+msgstr "Verd"
 
 #. SUBMENU_ITEM_CMS_COLOR_BLUE
-#, fuzzy
 msgid "Blue"
-msgstr "Difumina"
+msgstr "Blau"
 
 #. MENU_ITEM_COUNTER_LEN_INACTIVE
 msgid "inactive"
@@ -1446,11 +1439,11 @@ msgid "CCITT 1D Huffman compression"
 msgstr "Compressió CCITT 1D Huffman"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+msgid "CCITT Group 3 fax compression"
 msgstr "Compressió CCITT Fax Grup 3"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+msgid "CCITT Group 4 fax compression"
 msgstr "Compressió CCITT Fax Grup 4"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1550,18 +1543,16 @@ msgid "ASMTP CRAM-MD5"
 msgstr "ASMTP CRAM-MD5"
 
 #. MENU_ITEM_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE
-#, fuzzy
 msgid "Embed scanner ICM profile"
-msgstr "Elimina la impressora"
+msgstr "Inclou el perfil ICM de l'escàner"
 
 #. MENU_ITEM_CMS_FUNCTION_CONVERT_TO_SRGB
 msgid "Convert to sRGB"
-msgstr ""
+msgstr "Converteix a sRGB"
 
 #. MENU_ITEM_FUNCTION_CONVERT_TO_WORKING_CS
-#, fuzzy
 msgid "Convert to working color space"
-msgstr "Corregeix els colors automàticament"
+msgstr "Converteix a l'espai de color de treball"
 
 #. PROGRESS_SCANNING
 msgid "Scanning"
@@ -1576,13 +1567,13 @@ msgstr "S'estan rebent dades %s"
 msgid "page"
 msgstr "pàgina"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+msgid "Transferring image"
 msgstr "S'està transferint la imatge"
 
 #. PROGRESS_ROTATING_DATA
 msgid "Rotating image"
-msgstr "S'està rotant la imatge"
+msgstr "S'està girant la imatge"
 
 #. PROGRESS_MIRRORING_DATA
 msgid "Mirroring image"
@@ -1621,9 +1612,8 @@ msgid "OCR in progress"
 msgstr "OCR en progrés"
 
 #. PROGRESS_ICM_CONVERSION
-#, fuzzy
 msgid "converting colors"
-msgstr "Corregeix els colors automàticament"
+msgstr "S'estan convertint els colors"
 
 #. DESC_SCAN_START
 msgid "Start scan <Ctrl-Enter>"
@@ -1652,15 +1642,15 @@ msgstr ""
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
 msgstr ""
 "Seleccioneu el tipus de mitjà d'origen.\n"
 "Per a reanomenar, reordenar o eliminar una entrada empreu el menú contextual "
-"(botó dret del ratolí).\n"
-"Per a crear un mitjà, habiliteu l'opció \"Edita la definició del mitjà\" al "
+"(botó secundari del ratolí).\n"
+"Per a crear un mitjà, habiliteu l'opció «Edita la definició del mitjà» al "
 "menú Preferències."
 
 #. DESC_FILENAME_COUNTER_STEP
@@ -1686,9 +1676,8 @@ msgstr ""
 "automàticament al nom del fitxer"
 
 #. DESC_FAXPROJECT
-#, fuzzy
 msgid "Enter fax project directory name"
-msgstr "Navega per a trobar el directoi temporal"
+msgstr "Introduïu el nom de directori per al projecte de fax"
 
 #. DESC_FAXPAGENAME
 msgid "Enter new name for faxpage"
@@ -1699,14 +1688,12 @@ msgid "Enter receiver phone number or address"
 msgstr "Introduïu el número de telèfon o l'adreça del receptor"
 
 #. DESC_FAX_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for fax project directory"
-msgstr "Navega per a trobar el directoi temporal"
+msgstr "Navegueu fins al directori per al projecte de fax"
 
 #. DESC_EMAIL_PROJECT
-#, fuzzy
 msgid "Enter e-mail project directory name"
-msgstr "Navega per a trobar el directoi temporal"
+msgstr "Introduïu el nom de directori per al projecte de correu electrònic"
 
 #. DESC_EMAIL_IMAGENAME
 msgid "Enter new name for e-mail image"
@@ -1717,9 +1704,8 @@ msgid "Enter e-mail address"
 msgstr "Introduïu una adreça electrònica"
 
 #. DESC_EMAIL_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for email project directory"
-msgstr "Navega per a trobar el directoi temporal"
+msgstr "Navegueu fins al directori per al projecte de correu electrònic"
 
 #. DESC_EMAIL_SUBJECT
 msgid "Enter subject of e-mail"
@@ -1730,14 +1716,12 @@ msgid "Select filetype for image attachments"
 msgstr "Seleccioneu el tipus de fitxer per a les imatges adjuntes"
 
 #. DESC_MULTIPAGE_PROJECT
-#, fuzzy
 msgid "Enter multipage project directory name"
-msgstr "Navega per a trobar el directoi temporal"
+msgstr "Introduïu el nom de directori per al projecte multipàgina"
 
 #. DESC_MULTIPAGE_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for multipage project directory"
-msgstr "Navega per a trobar el directoi temporal"
+msgstr "Navegueu fins al directori per al projecte multipàgina"
 
 #. DESC_MULTIPAGE_FILETYPE
 msgid "Select filetype for multipage file"
@@ -1862,9 +1846,8 @@ msgstr ""
 " Contrast = 0"
 
 #. DESC_ENH_AUTO
-#, fuzzy
 msgid "Autoadjust gamma, brightness and contrast <Ctrl-a>"
-msgstr "Ajusta automàticament la gamma, la lluminositat i el contrast <Ctrl-e>"
+msgstr "Ajusta automàticament la gamma, la lluminositat i el contrast <Ctrl-a>"
 
 #. DESC_ENH_DEFAULT
 msgid ""
@@ -1923,7 +1906,7 @@ msgstr "Definiu un nom per a la selecció d'aquesta definició"
 
 #. DESC_PRINTER_COMMAND
 msgid "Enter command to be executed in copy mode (e.g. \"lpr\")"
-msgstr "Introduïu l'ordre que s'executarà en mode de còpia (p.ex.: \"lpr\")"
+msgstr "Introduïu l'ordre que s'executarà en mode de còpia (p.ex.: «lpr»)"
 
 #. DESC_COPY_NUMBER_OPTION
 msgid "Enter option for copy numbers"
@@ -1987,18 +1970,17 @@ msgstr "Valor gamma addicional de la component blava per a les fotocòpies"
 
 #. DESC_PRINTER_EMBED_CSA
 msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-msgstr ""
+msgstr "Crea un fitxer PostScript que conté el perfil ICM de l'escàner"
 
 #. DESC_PRINTER_EMBED_CRD
 msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-msgstr ""
+msgstr "Crea un fitxer PostScript que conté el perfil ICM de la impressora"
 
 #. DESC_PRINTER_CMS_BPC
 msgid "Applies black point compensation"
-msgstr ""
+msgstr "Aplica compensació de punt negre"
 
 #. DESC_PRINTER_PS_FLATEDECODED
-#, fuzzy
 msgid ""
 "Create zlib compressed postscript image for printer (flatedecode).\n"
 "The printer has to understand postscript level 3!"
@@ -2017,13 +1999,13 @@ msgstr "Navega per a trobar el directoi temporal"
 
 #. DESC_JPEG_QUALITY
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Qualitat, en percentatge, si deseu la imatge en JPEG o en TIFF amb "
 "compressió JPEG"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+msgid "Compression if image is saved as PNG"
 msgstr "Compressió si deseu la imatge en format PNG"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2032,19 +2014,19 @@ msgstr ""
 "Nombre mínim de xifres per al comptador en els noms de fitxers consecutius"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Grau de compressió per als TIFF comprimits amb zip (algoritme Deflate)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Tipus de compressió si deseu en TIFF una imatge de 16 bits"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Tipus de compressió si deseu en TIFF una imatge de 8 bits"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr ""
 "Tipus de compressió si deseu en TIFF una imatge amb profunditat binària "
 "(mode línia)"
@@ -2067,7 +2049,6 @@ msgstr ""
 "els números ja usats"
 
 #. DESC_SAVE_PS_FLATEDECODED
-#, fuzzy
 msgid ""
 "compress postscript image with zlib algorithm (flatedecode). When you want "
 "to print such a file your printer has to understand postscript level 3"
@@ -2077,15 +2058,14 @@ msgstr ""
 "format PostScript nivell 3"
 
 #. DESC_SAVE_PDF_FLATEDECODED
-#, fuzzy
 msgid "compress PDF image with zlib algorithm (flatedecode)."
-msgstr "Comprimeix les imatges PDF amb l'algoritme FlatDecode de zlib"
+msgstr "Comprimeix les imatges PDF amb l'algoritme FlatDecode de zlib."
 
 #. DESC_SAVE_PNM16_AS_ASCII
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Quan hagueu de desar una imatge de 16 bits en format PNM, empreu el format "
@@ -2094,12 +2074,11 @@ msgstr ""
 "programes, però produeix fitxers molt grans."
 
 #. DESC_REDUCE_16BIT_TO_8BIT
-#, fuzzy
 msgid ""
 "If scanner sends image with 16 bits/channel save image with 8 bits/channel"
 msgstr ""
-"Si l'escàner envia la imatge amb 16 bits per color, desa-la amb 8 bits per "
-"color"
+"Si l'escàner envia la imatge amb 16 bits per canal, desa-la amb 8 bits per "
+"canal"
 
 #. DESC_PSFILE_WIDTH
 msgid "Width of paper for postscript files"
@@ -2132,7 +2111,6 @@ msgstr ""
 "barra de desplaçament"
 
 #. DESC_DISABLE_GIMP_PREVIEW_GAMMA
-#, fuzzy
 msgid "Disable preview gamma when XSane runs as GIMP plugin"
 msgstr ""
 "Inhabilita la previsualització de la correcció gamma quan l'XSane funciona "
@@ -2149,7 +2127,7 @@ msgid "Select how a range is displayed"
 msgstr "Seleccioneu com es mostren els intervals de valors"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr ""
 "Valor amb què es multiplica la resolució de previsualització calculada "
 "prèviament"
@@ -2223,7 +2201,7 @@ msgstr ""
 
 #. DESC_DOC_VIEWER
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Introduïu l'ordre a executar per a mostrar els fitxers d'ajuda. Ha de ser un "
 "visualitzador d'HTML."
@@ -2232,8 +2210,8 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Canvia el valor de la gamma en prémer el botó de realçament automàtic"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+msgid "Select scan area after preview scan has finished"
 msgstr "Selecciona l'àrea d'escaneig quan l'escaneig de previsualització acabi"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2241,13 +2219,14 @@ msgid "Do color correction after preview scan has finished"
 msgstr "Corregeix el color quan l'escaneig de previsualització acabi"
 
 #. DESC_RENDERING_INTENT
-#, fuzzy
 msgid "Select rendering intent for preview and saving"
-msgstr "Selecciona l'àrea d'escaneig quan l'escaneig de previsualització acabi"
+msgstr ""
+"Selecciona el propòsit de renderització per a la previsualització i el "
+"desament"
 
 #. DESC_CMS_BPC
 msgid "Apply black point compensation when color transformation is done"
-msgstr ""
+msgstr "Aplica compensació de punt negre quan acabi la transformació de color"
 
 #. DESC_FAX_COMMAND
 msgid "Enter command to be executed in fax mode"
@@ -2280,7 +2259,6 @@ msgstr ""
 "Envia el fax amb resolució vertical alta (196 lpi per comptes de 98 lpi)"
 
 #. DESC_FAX_PS_FLATEDECODED
-#, fuzzy
 msgid "Create zlib compressed postscript image for fax (flatedecode)"
 msgstr ""
 "Crea imatges PostScript comprimides amb zlib per als faxos (algoritme "
@@ -2323,31 +2301,31 @@ msgid "port to connect to POP3 server"
 msgstr "Port per a connectar al servidor POP3"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "El missatge s'enviarà en HTML; podeu incorporar-hi imatges amb <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+msgid "Enter command to start OCR program"
 msgstr "Introduïu l'ordre per a iniciar el programa d'OCR"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+msgid "Enter option of the OCR program to define input file"
 msgstr "Introduïu l'opció del programa d'OCR per a definir el fitxer d'entrada"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+msgid "Enter option of the OCR program to define output file"
 msgstr ""
 "Introduïu l'opció del programa d'OCR per a definir el fitxer de sortida"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr ""
 "Especifiqueu si el programa d'OCR permet l'ús d'un conducte de progrés a la "
 "interfície gràfica"
 
 #. DESC_OCR_OUTFD_OPT
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Introduïu l'opció del programa d'OCR per a definir el descriptor del fitxer "
 "de sortida en mode gràfic"
@@ -2366,9 +2344,8 @@ msgid "write"
 msgstr "escriptura"
 
 #. DESC_PERMISSION_SEARCH
-#, fuzzy
 msgid "search"
-msgstr "Usuari"
+msgstr "cerca"
 
 #. DESC_ADD_BATCH
 msgid "Add selection for batch scan"
@@ -2387,7 +2364,7 @@ msgid "Pick black point"
 msgstr "Tria un punt negre"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+msgid "Use full scan area"
 msgstr "Usa tota l'àrea d'escaneig"
 
 #. DESC_ZOOM_OUT
@@ -2411,12 +2388,12 @@ msgstr "Desfés l'última ampliació"
 msgid "Select visible area"
 msgstr "Seleccioneu l'àrea visible"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+msgid "Autoselect scan area"
 msgstr "Selecciona automàticament l'àrea d'escaneig"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+msgid "Autoraise scan area"
 msgstr "Posa davant automàticament l'àrea d'escaneig"
 
 #. DESC_DELETE_IMAGES
@@ -2426,16 +2403,16 @@ msgstr "Buida la memòria cau de la imatge de previsualització"
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Àrea prefixada:\n"
 "Per a afegir una àrea nova o editar-ne una d'existent, useu el menú "
-"contextual (botó dret del ratolí)"
+"contextual (botó secundari del ratolí)"
 
 #. DESC_ROTATION
 msgid "Rotate preview and scan"
-msgstr "Rota la previsualització i l'escaneig"
+msgstr "Gira la previsualització i l'escaneig"
 
 #. DESC_RATIO
 msgid "Aspect ratio of selection"
@@ -2458,16 +2435,16 @@ msgid "Clone image"
 msgstr "Clona la imatge"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
-msgstr "Rota la imatge 90 graus"
+msgid "Rotate image 90 degrees"
+msgstr "Gira la imatge 90 graus"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
-msgstr "Rota la imatge 180 graus"
+msgid "Rotate image 180 degrees"
+msgstr "Gira la imatge 180 graus"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
-msgstr "Rota la imatge 270 graus"
+msgid "Rotate image 270 degrees"
+msgstr "Gira la imatge 270 graus"
 
 #. DESC_MIRROR_X
 msgid "Mirror image at vertical axis"
@@ -2502,11 +2479,11 @@ msgid "Y-Scale factor"
 msgstr "Factor d'escala en Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+msgid "Scale image to width [pixels]"
 msgstr "Escala la imatge a l'amplada especificada (en píxels)"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+msgid "Scale image to height [pixels]"
 msgstr "Escala la imatge a l'alçària especificada (en píxels)"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2538,34 +2515,28 @@ msgid "Turns on automatic mode"
 msgstr "Activa el mode automàtic"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_COLOR_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for scanner default color ICM-profile"
-msgstr "Navegueu per a trobar el nom de fitxer de la imatge"
+msgstr "Navegueu fins al perfil ICM de color predeterminat de l'escàner"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_GRAY_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for scanner default gray ICM-profile"
-msgstr "Navegueu per a trobar el nom de fitxer de la imatge"
+msgstr "Navegueu fins al perfil ICM de grisos predeterminat de l'escàner"
 
 #. DESC_BUTTON_DISPLAY_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for display ICM-profile"
-msgstr "Navegueu per a trobar el nom de fitxer de la imatge"
+msgstr "Navegueu fins al perfil ICM de la pantalla"
 
 #. DESC_BUTTON_PRINTER_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for printer ICM-profile"
-msgstr "Navegueu per a trobar el nom de fitxer de la imatge"
+msgstr "Navegueu fins al perfil ICM de la impressora"
 
 #. DESC_BUTTON_CUSTOM_PROOFING_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for custom proofing ICM-profile"
-msgstr "Navegueu per a trobar el nom de fitxer de la imatge"
+msgstr "Navegueu fins al perfil ICM per a proves personalitzades"
 
 #. DESC_BUTTON_WORKING_COLOR_SPACE_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for working color space ICM-profile"
-msgstr "Navegueu per a trobar el nom de fitxer de la imatge"
+msgstr "Navegueu fins al perfil ICM de l'espai de color amb què treballareu"
 
 #. ERR_HOME_DIR
 msgid "Failed to determine home directory:"
@@ -2631,7 +2602,7 @@ msgid "Failed to open"
 msgstr "No s'ha pogut obrir"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "No s'ha pogut crear un fitxer segur (potser hi ha un enllaç):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2712,7 +2683,7 @@ msgid "Failed to execute fax command:"
 msgstr "No s'ha pogut executar l'ordre de fax:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
+msgid "Failed to execute OCR command:"
 msgstr "No s'ha pogut executar l'ordre d'OCR:"
 
 #. ERR_BAD_FRAME_FORMAT
@@ -2777,7 +2748,7 @@ msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Esteu provant d'executar l'XSane com a usuari root. Això és MOLT PERILLÓS.\n"
@@ -2860,34 +2831,28 @@ msgid "Unsupported %d-bit output format: %s"
 msgstr "Format de sortida de %d bits no permés: %s"
 
 #. ERR_CMS_CONVERSION
-#, fuzzy
 msgid "Error during CMS conversion:"
-msgstr "S'ha produït un error en desar:"
+msgstr "S'ha produït un error en la conversió CMS:"
 
 #. ERR_CMS_OPEN_ICM_FILE
-#, fuzzy
 msgid "Could not open"
 msgstr "No s'ha pogut obrir"
 
 #. CMS_SCANNER_ICM
-#, fuzzy
 msgid "scanner ICM profile"
-msgstr "Elimina la impressora"
+msgstr "Perfil ICM de l'escàner"
 
 #. CMS_DISPLAY_ICM
-#, fuzzy
 msgid "display ICM profile"
-msgstr "Navegueu per a trobar el nom de fitxer de la imatge"
+msgstr "Perfil ICM de la pantalla"
 
 #. CMS_PROOF_ICM
-#, fuzzy
 msgid "proofing ICM profile"
-msgstr "Elimina la impressora"
+msgstr "Perfil ICM per a proves"
 
 #. ERR_CMS_CREATE_TRANSFORM
-#, fuzzy
 msgid "Could not create transform"
-msgstr "No s'ha pogut crear el projecte de fax"
+msgstr "No s'ha pogut crear la trasformació"
 
 #. WARN_VIEWER_IMAGE_NOT_SAVED
 msgid "viewer image is not saved"
@@ -2895,31 +2860,27 @@ msgstr "La imatge del visualitzador no s'ha desat"
 
 #. FILE_FILTER_ALL_FILES
 msgid "All files"
-msgstr ""
+msgstr "Tots els fitxers"
 
 #. FILE_FILTER_IMAGES
-#, fuzzy
 msgid "Images"
-msgstr "Pàgines:"
+msgstr "Imatges"
 
 #. FILE_FILTER_XBL
-#, fuzzy
 msgid "XSane batch list"
-msgstr "Desa el lot d'escaneig"
+msgstr "Lot d'escaneig de l'XSane"
 
 #. FILE_FILTER_ICM
 msgid "ICC/ICM Profiles"
-msgstr ""
+msgstr "Perfils ICC/ICM"
 
 #. FILE_FILTER_DRC
-#, fuzzy
 msgid "XSane device preferences"
-msgstr "Desa la configuració del dispositiu en sortir"
+msgstr "Preferències de dispositiu de l'XSane"
 
 #. FILE_FILTER_RC
-#, fuzzy
 msgid "XSane preferences"
-msgstr "Preferències"
+msgstr "Preferències de l'XSane"
 
 #. TEXT_USAGE
 msgid "Usage:"
@@ -2976,7 +2937,7 @@ msgstr ""
 " -l, --license                imprimeix informació de la llicència\n"
 "\n"
 " -d, --device-settings file   carrega una configuració de dispositiu d'un "
-"fitxer (sense \".drc\")\n"
+"fitxer (sense «.drc»)\n"
 "\n"
 " -V, --viewer                 inicia amb el mode de visualització actiu "
 "(predeterminat)\n"
@@ -3042,7 +3003,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Possibles motius:\n"
@@ -3051,8 +3012,8 @@ msgstr ""
 "3) Els permisos del fitxer de dispositiu no permeten que l'useu. Proveu com "
 "a root\n"
 "4) El SANE no ha carregat el controlador (man sane-dll)\n"
-"5) El controlador no s'ha configurat correctament (man sane-"
-"\"nomdelcontrolador\")\n"
+"5) El controlador no s'ha configurat correctament (man "
+"sane-«nomdelcontrolador»)\n"
 "6) Probablement hi hagi més d'una versió del SANE instal·lada"
 
 #. strings that are used in structures, so it is not allowed to use _()/gettext() here
@@ -3219,7 +3180,7 @@ msgstr "Ha fallat la connexió SMTP"
 
 #. TEXT_EMAIL_STATUS_SMTP_ERR_FROM
 msgid "From entry not accepted"
-msgstr "No s'ha acceptat el camp \"De:\""
+msgstr "No s'ha acceptat el camp «De:»"
 
 #. TEXT_EMAIL_STATUS_SMTP_ERR_RCPT
 msgid "Receiver entry not accepted"
@@ -3238,7 +3199,7 @@ msgid "E-mail has been sent"
 msgstr "S'ha enviat el missatge"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+msgid "Queueing fax"
 msgstr "S'està posant el fax a la cua"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3299,62 +3260,3 @@ msgstr "Sense memòria"
 
 msgid "Access to resource has been denied"
 msgstr "S'ha denegat l'accés al recurs"
-
-#, fuzzy
-#~ msgid "select scanner transmissive ICM-profile"
-#~ msgstr "Elimina la impressora"
-
-#, fuzzy
-#~ msgid "select scanner transmissive gray ICM-profile"
-#~ msgstr "Elimina la impressora"
-
-#, fuzzy
-#~ msgid "Scanner reflective ICM-profile"
-#~ msgstr "Elimina la impressora"
-
-#, fuzzy
-#~ msgid "Scanner reflective gray ICM-profile"
-#~ msgstr "Elimina la impressora"
-
-#, fuzzy
-#~ msgid "Scanner transmissive gray ICM-profile"
-#~ msgstr "Elimina la impressora"
-
-#, fuzzy
-#~ msgid "Scanner reflektive ICM-profile"
-#~ msgstr "Elimina la impressora"
-
-#, fuzzy
-#~ msgid "Browse for scanner transmissive ICM-profile"
-#~ msgstr "Navegueu per a trobar el nom de fitxer de la imatge"
-
-#, fuzzy
-#~ msgid "Browse for scanner transmissive gray ICM-profile"
-#~ msgstr "Navegueu per a trobar el nom de fitxer de la imatge"
-
-#~ msgid "GIMP can't handle depth %d bits/color"
-#~ msgstr "El Gimp no pot gestionar una profunditat de %d bits/color"
-
-#, fuzzy
-#~ msgid "scanner reflective ICM profile"
-#~ msgstr "Elimina la impressora"
-
-#, fuzzy
-#~ msgid "Embed scanner/source ICM profile for GIMP"
-#~ msgstr "Elimina la impressora"
-
-#~ msgid "Enter name of fax project"
-#~ msgstr "Introduïu el nom del projecte de fax"
-
-#~ msgid "Enter name of e-mail project"
-#~ msgstr "Introduïu el nom del projecte de correu electrònic"
-
-#~ msgid "Enter name of multipage project"
-#~ msgstr "Introduïu el nom del projecte de multipàgina"
-
-#~ msgid ""
-#~ "Gimp does not support depth 16 bits/color.\n"
-#~ "Do you want to reduce the depth to 8 bits/color?"
-#~ msgstr ""
-#~ "El Gimp no permet l'ús de 16 bits per color.\n"
-#~ "Voleu reduir la profunditat a 8 bits per color?"
diff --git a/po/cs.gmo b/po/cs.gmo
index f0985d0..4422f03 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index ece2f80..1bf05cf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2005-12-31 16:09+0100\n"
 "Last-Translator: Stanislav Brabec <utx@penguin.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -83,7 +83,8 @@ msgid "rename fax page"
 msgstr "přejmenovat faxovou stránku"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "zadat ps-soubor pro fax"
 
 #. WINDOW_EMAIL_PROJECT
@@ -502,7 +503,8 @@ msgid "Skip existing filenames"
 msgstr "Přeskočit existující jména souborů"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+#, fuzzy
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr "Zapsat zlib komprimovaný postscript (ps level 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -510,7 +512,8 @@ msgid "Save PDF zlib compressed"
 msgstr "Zapsat zlib komprimovaný PDF"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Zapsat 16bitový pnm v ascii formátu"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -534,8 +537,9 @@ msgstr "Použít vlastní barevnou mapu"
 msgid "Autoenhance gamma"
 msgstr "Automaticky upravit gama"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Předvolba skenovací plochy"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -559,10 +563,6 @@ msgstr "procházejí se zařízení"
 msgid "Available devices:"
 msgstr "Dostupná zařízení:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Předvolby XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Typ"
@@ -887,53 +887,72 @@ msgstr "Příkaz:"
 msgid "Copy number option:"
 msgstr "Volba počtu kopií:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Nastavení rozlišení skenování"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Rozlišení čárové grafiky (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Rozlišení v šedích (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Rozlišení v barvě (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Šířka"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Výška"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Levý posun"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Spodní posun"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Červená gama tiskárny:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Gama hodnota tiskárny:"
+#, fuzzy
+msgid "common value"
+msgstr "Aktuální hodnoty:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Červená gama tiskárny:"
+#, fuzzy
+msgid "red"
+msgstr "čtení"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Zelená gama tiskárny:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Modrá gama tiskárny:"
+#, fuzzy
+msgid "blue"
+msgstr "Rozostření"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -950,7 +969,8 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr "Vytvořit zlib komprimovaný postscript (ps level 3) pro tisk"
 
 #. TEXT_SETUP_TMP_PATH
@@ -1073,8 +1093,25 @@ msgstr "Nastavit implicitní program pro:"
 msgid "Viewer (Postscript):"
 msgstr "Prohlížeč (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Šířka"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Výška"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Levý posun"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Spodní posun"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr "Vytvořit zlib komprimovaný postscript (ps level 3) pro fax"
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1441,11 +1478,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "Huffmanova komprese CCITT 1D"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "Komprese CCITT Group 3 Fax"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "Komprese CCITT Group 4 Fax"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1571,8 +1610,9 @@ msgstr "Přijímají se data typu %s"
 msgid "page"
 msgstr "stránka"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Obrázek se přenáší"
 
 #. PROGRESS_ROTATING_DATA
@@ -1645,9 +1685,10 @@ msgstr ""
 "fax-<Ctrl-f> nebo pošta-<Ctrl-e>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2003,14 +2044,16 @@ msgid "Browse for temporary directory"
 msgstr "Vyhledat pomocný adresář"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Kvalita v procentech, je-li obrázek zapisován jako jpeg nebo tiff s jpeg "
 "kompresí"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Komprese, je-li obrázek zapisován jako png"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2018,19 +2061,23 @@ msgid "Minimum length of counter in filename"
 msgstr "Minimální délka čítače ve jménu souboru"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+#, fuzzy
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Úroveň komprese pro ZIP komprimované TIFF (deflační)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Typ komprese, je-li obrázek zapisován jako 16bitový TIFF"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Typ komprese, je-li obrázek zapisován jako 8bitový TIFF"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Typ komprese, je-li obrázek zapisován jako TIFF čárová grafika"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2063,10 +2110,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr "komprimovat PDF obrázek algoritmem zlib (flat dekódování)."
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Pokud má být 16bitový obrázek zapsán ve formátu pnm, potom použijte ascii "
@@ -2124,7 +2172,8 @@ msgid "Select how a range is displayed"
 msgstr "Zvolte, jak je rozsah zobrazován"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Hodnota, kterou se násobí rozlišení náhledu"
 
 #. DESC_PREVIEW_GAMMA
@@ -2186,8 +2235,9 @@ msgstr ""
 "rozměry čtverce, který je použit ke zprůměrování barvy pro barevnou pipetu"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Nastavení příkazu k zobrazení souborů nápovědy, musí být html prohlížeč!"
 
@@ -2195,8 +2245,9 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Je-li tlačítko automatické úpravy stisknuto, změní gama hodnotu"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "Po naskenování náhledu vybere skenovací oblast"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2283,29 +2334,35 @@ msgid "port to connect to POP3 server"
 msgstr "port pro připojení k POP3 serveru"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+#, fuzzy
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "E-mail je posílán v režimu html, umístěte obrázek pomocí: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Zadejte příkaz pro spuštění ocr programu"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Zadejte volbu ocr programu pro zadání vstupního souboru"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Zadejte volbu ocr programu pro zadání výstupního souboru"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr ""
 "Zadejte, zda OCR program podporuje rouru pro grafické znázornění průběhu"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr "Zadejte, zda OCR program podporuje grafickou volbu souboru"
 
 #. DESC_OCR_PROGRESS_KEYWORD
@@ -2342,7 +2399,8 @@ msgid "Pick black point"
 msgstr "Nasátí černého bodu"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Užití plné skenovací plochy"
 
 #. DESC_ZOOM_OUT
@@ -2366,12 +2424,14 @@ msgstr "Vrácení posledního přiblížení"
 msgid "Select visible area"
 msgstr "Volba viditelné oblasti"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Automatický výběr skenovací plochy"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Automatické zvětšení skenovací plochy"
 
 #. DESC_DELETE_IMAGES
@@ -2379,9 +2439,10 @@ msgid "Delete preview image cache"
 msgstr "Smazat paměť náhledu"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Předvolená oblast:\n"
@@ -2413,15 +2474,18 @@ msgid "Clone image"
 msgstr "Duplikovat obrázek"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Rotovat obrázek o 90 stupňů"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Rotovat obrázek o 180 stupňů"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Rotovat obrázek o 270 stupňů"
 
 #. DESC_MIRROR_X
@@ -2457,11 +2521,13 @@ msgid "Y-Scale factor"
 msgstr "Faktoru změny velikosti Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Zmenit velikost obrázku na šířku [v pixelech]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Zmenit velikost obrázku na výšku [v pixelech]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2583,7 +2649,8 @@ msgid "Failed to open"
 msgstr "Otevření selhalo"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Nelze vytvořit bezpečný soubor (možná, že existuje odkaz):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2659,8 +2726,9 @@ msgid "Failed to execute fax command:"
 msgstr "Spuštění faxového příkazu selhalo:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Spuštění ocr příkazu selhalo:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Spuštění faxového příkazu selhalo:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2720,11 +2788,12 @@ msgid "warning: option has no value constraint"
 msgstr "varování: volba nezískala žádnou hodnotu"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Spouštíte XSane jako SUPERUŽIVATEL, což je velmi NEBEZPEČNÉ!\n"
@@ -2979,6 +3048,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Toolbox>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -2986,7 +3056,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Možné důvody:\n"
@@ -3180,7 +3250,8 @@ msgid "E-mail has been sent"
 msgstr "Zpráva byla odeslána"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Fax se přidává do fronty"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3242,6 +3313,24 @@ msgstr "Nedostatek paměti"
 msgid "Access to resource has been denied"
 msgstr "Přístup ke zdroji byl odmítnut"
 
+#~ msgid "XSane options"
+#~ msgstr "Předvolby XSane"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Spuštění ocr příkazu selhalo:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Rozlišení v barvě (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Gama hodnota tiskárny:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Zelená gama tiskárny:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Modrá gama tiskárny:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Odebrat tiskárnu"
diff --git a/po/da.gmo b/po/da.gmo
index a667dfa..e3d1edd 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 1ec4a68..179db40 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,20 +1,21 @@
-# translation of da.po to Danish
+# translation of da-ny.po to Danish
 # Dansk oversættelse af XSane.
 # Copyright (C) 2002 Mogens Jæger <mogensjaeger@get2net.dk>
-# Mogens Jaeger <mogensjaeger@get2net.dk>, 2004, 2005.
 #
+# Mogens Jaeger <mogensjaeger@get2net.dk>, 2004, 2005.
+# Mogens Jaeger <mogens@jaeger.tf>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
-"PO-Revision-Date: 2005-12-31 04:36+0100\n"
-"Last-Translator: Mogens Jaeger <mogensjaeger@get2net.dk>\n"
-"Language-Team: Danish <dansk@klid.dk>\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
+"PO-Revision-Date: 2007-10-01 02:16+0200\n"
+"Last-Translator: Mogens Jaeger <mogens@jaeger.tf>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Please translate this to the correct directory name (eg. german=>de)
 #. XSANE_LANGUAGE_DIR
@@ -76,26 +77,24 @@ msgid "fax project"
 msgstr "fax projekt"
 
 #. WINDOW_FAX_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for fax project"
-msgstr "Angiv navn på fax projekt"
+msgstr "søg efter fax projekt"
 
 #. WINDOW_FAX_RENAME
 msgid "rename fax page"
 msgstr "omdøb fax side"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
-msgstr "indsæt ps-fil i fax"
+msgid "insert PS-file into fax"
+msgstr "indsæt PS-fil i fax"
 
 #. WINDOW_EMAIL_PROJECT
 msgid "E-mail project"
 msgstr "E-post projekt"
 
 #. WINDOW_EMAIL_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for email project"
-msgstr "Angiv navn på e-post projekt"
+msgstr "søg efter e-post projekt"
 
 #. WINDOW_EMAIL_RENAME
 msgid "rename e-mail image"
@@ -107,12 +106,11 @@ msgstr "indsæt fil i e-post"
 
 #. WINDOW_MULTIPAGE_PROJECT
 msgid "multipage project"
-msgstr "flerside projekt"
+msgstr "flersidet projekt"
 
 #. WINDOW_MULTIPAGE_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for multipage project"
-msgstr "flerside projekt"
+msgstr "søg efter flersidet projekt"
 
 #. WINDOW_PRESET_AREA_RENAME
 msgid "rename preset area"
@@ -215,33 +213,28 @@ msgid "No devices available"
 msgstr "Ingen enheder til rådighed"
 
 #. WINDOW_SCANNER_DEFAULT_COLOR_ICM_PROFILE
-#, fuzzy
 msgid "select scanner default color ICM-profile"
-msgstr "Slet printer"
+msgstr "vælg skannerens standard ICM-profil"
 
 #. WINDOW_SCANNER_DEFAULT_GRAY_ICM_PROFILE
-#, fuzzy
 msgid "select scanner default gray ICM-profile"
-msgstr "Slet printer"
+msgstr "vælg skannerens standard grå ICM-profil"
 
 #. WINDOW_DISPLAY_ICM_PROFILE
 msgid "select display ICM-profile"
-msgstr ""
+msgstr "vælg skærm ICM-profil"
 
 #. WINDOW_CUSTOM_PROOFING_ICM_PROFILE
-#, fuzzy
 msgid "select custom proofing ICM-profile"
-msgstr "vælg uddatafilnavn"
+msgstr "vælg brugerdefineret ICM-profil"
 
 #. WINDOW_WORKING_COLOR_SPACE_ICM_PROFILE
-#, fuzzy
 msgid "select working color space ICM-profile"
-msgstr "Slet printer"
+msgstr "vælg ICM-profil for arbejdsfarverum"
 
 #. WINDOW_PRINTER_ICM_PROFILE
-#, fuzzy
 msgid "select printer ICM-profile"
-msgstr "Slet printer"
+msgstr "vælg printer ICM-profil"
 
 #. MENU_FILE
 msgid "File"
@@ -279,7 +272,7 @@ msgstr "Geometri"
 #. MENU_COLOR_MANAGEMENT
 #. NOTEBOOK_COLOR_MANAGEMENT_OPTIONS
 msgid "Color management"
-msgstr ""
+msgstr "Farvestyring"
 
 #. MENU_ITEM_ABOUT_XSANE
 msgid "About XSane"
@@ -504,16 +497,16 @@ msgid "Skip existing filenames"
 msgstr "Drop eksisterende filnavne"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
-msgstr "Gem postscript zlib-komprimeret (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
+msgstr "Gem postscript zlib-komprimeret (PS level 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
 msgid "Save PDF zlib compressed"
 msgstr "Gem PDF zlib-komprimeret"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
-msgstr "Gem 16 bit pnm i ascii format"
+msgid "Save 16bit PNM in ASCII format"
+msgstr "Gem 16 bit PNM i ASCII format"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
 msgid "Reduce 16 bit image to 8 bit"
@@ -524,9 +517,8 @@ msgid "Main window size fixed"
 msgstr "Hoved-vinduesstørrelse er fast"
 
 #. RADIO_BUTTON_DISABLE_GIMP_PREVIEW_GAMMA
-#, fuzzy
 msgid "Disable GIMP preview gamma"
-msgstr "Deaktivér GIMP forhåndsvisnings gamma"
+msgstr "Deaktivér GIMP forhåndsvisnings-gamma"
 
 #. RADIO_BUTTON_PRIVATE_COLORMAP
 msgid "Use private colormap"
@@ -536,9 +528,9 @@ msgstr "Brug egen farvemappe"
 msgid "Autoenhance gamma"
 msgstr "Automatisk optimering af gamma"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
-msgstr "Automatisk valg af skanningsområde"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+msgid "Preselect scan area"
+msgstr "Forvalg skanningsområde"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
 msgid "Autocorrect colors"
@@ -551,7 +543,7 @@ msgstr "Brug GUI fremskridtsrør"
 #. RADIO_BUTTON_CMS_BPC
 #. MENU_ITEM_CMS_BLACK_POINT_COMPENSATION
 msgid "Black point compensation"
-msgstr ""
+msgstr "Sort-punkt kompensation"
 
 #. TEXT_SCANNING_DEVICES
 msgid "scanning for devices"
@@ -561,19 +553,14 @@ msgstr "Skanner efter enheder"
 msgid "Available devices:"
 msgstr "Enheder til rådighed:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "XSane indstillinger"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Type"
 
 #. TEXT_CMS_FUNCTION
 #. DESC_CMS_FUNCTION
-#, fuzzy
 msgid "Color management function"
-msgstr "Fuldt farveområde"
+msgstr "Farvestyringsfunktion"
 
 #. TEXT_SCANNER_BACKEND
 msgid "Scanner and backend:"
@@ -648,7 +635,6 @@ msgid "16 bit output formats:"
 msgstr "16 bit uddataformater:"
 
 #. TEXT_REDUCE_16BIT_TO_8BIT
-#, fuzzy
 msgid ""
 "Bit depth 16 bits/channel is not supported for this output format.\n"
 "Do you want to reduce the depth to 8 bits/channel?"
@@ -689,9 +675,8 @@ msgid "package"
 msgstr "pakke"
 
 #. TEXT_WITH_CMS_FUNCTION
-#, fuzzy
 msgid "with color management function"
-msgstr "Fuldt farveområde"
+msgstr "med farvestyringsfunktion"
 
 #. TEXT_WITH_GIMP_SUPPORT
 msgid "with GIMP support"
@@ -727,7 +712,7 @@ msgid ""
 "have to read, understand and accept the following\n"
 "\"NO WARRANTY\" agreement.\n"
 msgstr ""
-"XSane bliver distributeret under betingelserne i GNU General Public License\n"
+"XSane bliver distribueret under betingelserne i GNU General Public License\n"
 "som publiceret af the Free Software Foundation; enten version 2 af "
 "licensen,\n"
 "eller (efter eget ønske) enhver senere version.\n"
@@ -749,7 +734,7 @@ msgid ""
 "WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
-"XSane bliver distributeret under betingelserne i GNU General Public License\n"
+"XSane bliver distribueret under betingelserne i GNU General Public License\n"
 "som publiceret af the Free Software Foundation; enten version 2 af "
 "licensen,\n"
 "eller (efter eget ønske) enhver senere version.\n"
@@ -825,12 +810,12 @@ msgid "Medium Name:"
 msgstr "Medienavn:"
 
 #. TEXT_VIEWER_IMAGE_INFO
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Size %d x %d pixel, %d bits/channel, %d channels, %1.0f dpi x %1.0f dpi, %"
 "1.1f %s"
 msgstr ""
-"Størrelse %d x %d pixel, %d bit/farve, %d farver, %1.0f dpi x %1.0f dpi, %"
+"Størrelse %d x %d pixel, %d bit/kanal, %d kanaler, %1.0f dpi x %1.0f dpi, %"
 "1.1f %s"
 
 #. TEXT_DESPECKLE_RADIUS
@@ -839,7 +824,7 @@ msgstr "Fjern kornstøj radius:"
 
 #. TEXT_BLUR_RADIUS
 msgid "Blur radius:"
-msgstr "Sløringsradius"
+msgstr "Sløringsradius:"
 
 #. TEXT_BATCH_AREA_DEFAULT_NAME
 msgid "(no name)"
@@ -890,71 +875,77 @@ msgstr "Kommando:"
 msgid "Copy number option:"
 msgstr "Kopi nummerindstilling:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+msgid "Scan resolution:"
+msgstr "Skanneropløsning:"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
-msgstr "Stregtegning opløsning (dpi):"
+msgid "lineart [dpi]"
+msgstr "Stregtegning [dpi]"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
-msgstr "Gråskala opløsning (dpi):"
+msgid "grayscale [dpi]"
+msgstr "Gråskala [dpi]"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Farve opløsning (dpi):"
+msgid "color [dpi]"
+msgstr "farve [dpi]"
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr "Papir geometri:"
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
-msgstr "Bredde"
+msgid "width"
+msgstr "bredde"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
-msgstr "Højde"
+msgid "height"
+msgstr "højde"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
-msgstr "Venstre margen"
+msgid "left offset"
+msgstr "venstre margen"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
-msgstr "Bund margen"
+msgid "bottom offset"
+msgstr "bund margen"
+
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+msgid "Printer gamma:"
+msgstr "Printer gamma:"
 
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Printers gammaværdi:"
+msgid "common value"
+msgstr "standardværdi"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Printers gammaværdi i rød:"
+msgid "red"
+msgstr "rød"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Printers gammaværdi i grøn:"
+msgid "green"
+msgstr "grøn"
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Printers gammaværdi i blå:"
+msgid "blue"
+msgstr "blå"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
-#, fuzzy
 msgid "Embed scanner ICM profile as CSA"
-msgstr "Slet printer"
+msgstr "Indlejr skanner ICM profil som CSA"
 
 #. TEXT_SETUP_PRINTER_EMBED_CRD
-#, fuzzy
 msgid "Embed printer ICM profile as CRD"
-msgstr "Slet printer"
+msgstr "Indlejr printer ICM profil som CRD"
 
 #. TEXT_SETUP_PRINTER_CMS_BPC
 msgid "Apply black point compensation"
-msgstr ""
+msgstr "Tilføj sort punkt kompensation"
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
-msgstr "Dan zlib-komprimeret postscript-billede (ps level 3) til udskrivning"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
+msgstr "Dan zlib-komprimeret postscript-billede (PS level 3) til udskrivning"
 
 #. TEXT_SETUP_TMP_PATH
 msgid "Temporary directory"
@@ -1076,9 +1067,25 @@ msgstr "Sæt program standardværdier for:"
 msgid "Viewer (Postscript):"
 msgstr "Viser (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Bredde"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Højde"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Venstre margen"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Bund margen"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
-msgstr "Dan zlib-komprimeret postscript-billede (ps level 3) til fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
+msgstr "Dan zlib-komprimeret postscript-billede (PS level 3) til fax"
 
 #. TEXT_SETUP_SMTP_SERVER
 msgid "SMTP server:"
@@ -1130,7 +1137,7 @@ msgstr "Uddatafilindstilling:"
 
 #. TEXT_SETUP_OCR_USE_GUI_PIPE_OPT
 msgid "Use GUI progress pipe:"
-msgstr "Brug GUI fremskridtsrør"
+msgstr "Brug GUI fremskridtsrør:"
 
 #. TEXT_SETUP_OCR_OUTFD_OPT
 msgid "GUI output-fd option:"
@@ -1154,37 +1161,33 @@ msgstr "alle"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_COLOR_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_COLOR_ICM_PROFILE
-#, fuzzy
 msgid "Scanner default color ICM-profile"
-msgstr "Slet printer"
+msgstr "Skanners standard farve ICM-profil"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_GRAY_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_GRAY_ICM_PROFILE
-#, fuzzy
 msgid "Scanner default gray ICM-profile"
-msgstr "Slet printer"
+msgstr "Skanner standard grå ICM-profil"
 
 #. TEXT_SETUP_DISPLAY_ICM_PROFILE
 #. DESC_DISPLAY_ICM_PROFILE
 msgid "Display ICM-profile"
-msgstr ""
+msgstr "Skærm ICM-profil"
 
 #. TEXT_SETUP_CUSTOM_PROOFING_ICM_PROFILE
 #. DESC_CUSTOM_PROOFING_ICM_PROFILE
-#, fuzzy
 msgid "Custom proofing ICM-profile"
-msgstr "Slet printer"
+msgstr "Bruger test ICM-profil"
 
 #. TEXT_SETUP_WORKING_COLOR_SPACE_ICM_PROFILE
 #. DESC_WORKING_COLOR_SPACE_ICM_PROFILE
-#, fuzzy
 msgid "Working color space ICM-profile"
-msgstr "Søg efter billed filnavn"
+msgstr "Arbejds farverum ICM-profil"
 
 #. TEXT_SETUP_PRINTER_ICM_PROFILE
 #. DESC_PRINTER_ICM_PROFILE
 msgid "Printer ICM-profile"
-msgstr ""
+msgstr "Printer ICM-profil"
 
 msgid "new media"
 msgstr "nyt medie"
@@ -1303,9 +1306,8 @@ msgstr "Rotér postscript"
 
 #. MENU_ITEM_ENABLE_COLOR_MANAGEMENT
 #. MENU_ITEM_CMS_ENABLE_COLOR_MANAGEMENT
-#, fuzzy
 msgid "Enable color management"
-msgstr "Fuldt farveområde"
+msgstr "Tillad farvestyring"
 
 #. MENU_ITEM_EDIT_MEDIUM_DEF
 msgid "Edit medium definition"
@@ -1352,84 +1354,76 @@ msgid "Problems?"
 msgstr "Problemer?"
 
 #. MENU_ITEM_CMS_PROOFING
-#, fuzzy
 msgid "Proofing"
-msgstr "Tilføj printer"
+msgstr "Tester"
 
 #. SUBMENU_ITEM_CMS_PROOF_OFF
 msgid "no proofing (Display)"
-msgstr ""
+msgstr "ingen test (Skærm)"
 
 #. SUBMENU_ITEM_CMS_PROOF_PRINTER
-#, fuzzy
 msgid "Proof printer"
-msgstr "Tilføj printer"
+msgstr "Test printer"
 
 #. SUBMENU_ITEM_CMS_PROOF_CUSTOM
 msgid "Proof custom device"
-msgstr ""
+msgstr "Test brugerenhed"
 
 #. MENU_ITEM_CMS_RENDERING_INTENT
-#, fuzzy
 msgid "Rendering intent"
-msgstr "Tilføj printer"
+msgstr "Rendering intent"
 
 #. MENU_ITEM_CMS_PROOFING_INTENT
-#, fuzzy
 msgid "Proofing rendering intent"
-msgstr "Tilføj printer"
+msgstr "Tester rendering intent"
 
 #. SUBMENU_ITEM_CMS_INTENT_PERCEPTUAL
 msgid "Perceptual"
-msgstr ""
+msgstr "Vedr. sansning"
 
 #. SUBMENU_ITEM_CMS_INTENT_RELATIVE_COLORIMETRIC
 msgid "Relative colorimetric"
-msgstr ""
+msgstr "Relativ kolorimetrisk"
 
 #. SUBMENU_ITEM_CMS_INTENT_ABSOLUTE_COLORIMETRIC
 msgid "Absolute colorimentric"
-msgstr ""
+msgstr "Absolut kolorimetrisk"
 
 #. SUBMENU_ITEM_CMS_INTENT_SATURATION
-#, fuzzy
 msgid "Saturation"
-msgstr "autorisation"
+msgstr "Farvemætning"
 
 #. MENU_ITEM_CMS_GAMUT_CHECK
 msgid "Gamut check"
-msgstr ""
+msgstr "Kontrol af gamut"
 
 #. MENU_ITEM_CMS_GAMUT_ALARM_COLOR
 msgid "Gamut alarm color"
-msgstr ""
+msgstr "Gamut alarmfarve"
 
 #. SUBMENU_ITEM_CMS_COLOR_BLACK
 msgid "Black"
-msgstr ""
+msgstr "Sort"
 
 #. SUBMENU_ITEM_CMS_COLOR_GRAY
 msgid "Gray"
-msgstr ""
+msgstr "Grå"
 
 #. SUBMENU_ITEM_CMS_COLOR_WHITE
-#, fuzzy
 msgid "White"
-msgstr "skriv"
+msgstr "Hvid"
 
 #. SUBMENU_ITEM_CMS_COLOR_RED
-#, fuzzy
 msgid "Red"
-msgstr "Reducér"
+msgstr "Rød"
 
 #. SUBMENU_ITEM_CMS_COLOR_GREEN
 msgid "Green"
-msgstr ""
+msgstr "Grøn"
 
 #. SUBMENU_ITEM_CMS_COLOR_BLUE
-#, fuzzy
 msgid "Blue"
-msgstr "Slør"
+msgstr "Blå"
 
 #. MENU_ITEM_COUNTER_LEN_INACTIVE
 msgid "inactive"
@@ -1444,12 +1438,12 @@ msgid "CCITT 1D Huffman compression"
 msgstr "CCITT 1D Huffman kompression"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
-msgstr "CCITT gruppe 3 Fax kompression"
+msgid "CCITT Group 3 fax compression"
+msgstr "CCITT gruppe 3 fax kompression"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
-msgstr "CCITT gruppe 4 Fac kompression"
+msgid "CCITT Group 4 fax compression"
+msgstr "CCITT gruppe 4 fax kompression"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
 msgid "JPEG DCT compression"
@@ -1548,18 +1542,16 @@ msgid "ASMTP CRAM-MD5"
 msgstr "ASMTP CRAM-MD5"
 
 #. MENU_ITEM_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE
-#, fuzzy
 msgid "Embed scanner ICM profile"
-msgstr "Slet printer"
+msgstr "Indlejr skanner ICM-profil"
 
 #. MENU_ITEM_CMS_FUNCTION_CONVERT_TO_SRGB
 msgid "Convert to sRGB"
-msgstr ""
+msgstr "Konvertér til sRGB"
 
 #. MENU_ITEM_FUNCTION_CONVERT_TO_WORKING_CS
-#, fuzzy
 msgid "Convert to working color space"
-msgstr "Autooptimér farver"
+msgstr "Konvertér til arbejds farverum"
 
 #. PROGRESS_SCANNING
 msgid "Scanning"
@@ -1574,8 +1566,8 @@ msgstr "Modtager %s data"
 msgid "page"
 msgstr "side"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+msgid "Transferring image"
 msgstr "Overfører billede"
 
 #. PROGRESS_ROTATING_DATA
@@ -1619,9 +1611,8 @@ msgid "OCR in progress"
 msgstr "Tekstgenkendelse"
 
 #. PROGRESS_ICM_CONVERSION
-#, fuzzy
 msgid "converting colors"
-msgstr "Autooptimér farver"
+msgstr "Konverterer farver"
 
 #. DESC_SCAN_START
 msgid "Start scan <Ctrl-Enter>"
@@ -1650,15 +1641,15 @@ msgstr ""
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
 msgstr ""
 "Vælg kilde medietype.\n"
-"For at omdøbe, omarrangere eller slette en indføring bruges genvejsmenuen "
-"(højre musetaste).\n"
-"For at danne et nyt medie, aktivér indstillingen ret-medie-definition i "
+"For at omdøbe, omarrangere eller slette en indføring bruges kontekstmenuen "
+"(alternativt musetaste).\n"
+"For at danne et medie, aktivér indstillingen ret-medie-definition i "
 "indstillingsmenuen."
 
 #. DESC_FILENAME_COUNTER_STEP
@@ -1679,12 +1670,11 @@ msgid ""
 "to the filename"
 msgstr ""
 "Type af billedformat, den passende filendelse bliver automatisk tilføjet "
-"filnavnet."
+"filnavnet"
 
 #. DESC_FAXPROJECT
-#, fuzzy
 msgid "Enter fax project directory name"
-msgstr "Find sti til midlertidigt bibliotek"
+msgstr "Angiv fax projektets biblioteksnavn"
 
 #. DESC_FAXPAGENAME
 msgid "Enter new name for faxpage"
@@ -1695,14 +1685,12 @@ msgid "Enter receiver phone number or address"
 msgstr "Angiv modtager telefonnummer eller adresse"
 
 #. DESC_FAX_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for fax project directory"
-msgstr "Find sti til midlertidigt bibliotek"
+msgstr "Søg efter fax-projekt bibliotek"
 
 #. DESC_EMAIL_PROJECT
-#, fuzzy
 msgid "Enter e-mail project directory name"
-msgstr "Find sti til midlertidigt bibliotek"
+msgstr "Angiv biblioteksnavn til e-post projekt"
 
 #. DESC_EMAIL_IMAGENAME
 msgid "Enter new name for e-mail image"
@@ -1713,9 +1701,8 @@ msgid "Enter e-mail address"
 msgstr "Angiv e-post adresse"
 
 #. DESC_EMAIL_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for email project directory"
-msgstr "Find sti til midlertidigt bibliotek"
+msgstr "Søg efter e-post projektbibliotek"
 
 #. DESC_EMAIL_SUBJECT
 msgid "Enter subject of e-mail"
@@ -1726,14 +1713,12 @@ msgid "Select filetype for image attachments"
 msgstr "Vælg filtype for billed vedhæftninger"
 
 #. DESC_MULTIPAGE_PROJECT
-#, fuzzy
 msgid "Enter multipage project directory name"
-msgstr "Find sti til midlertidigt bibliotek"
+msgstr "Angiv biblioteksnavn til flersidet projekt"
 
 #. DESC_MULTIPAGE_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for multipage project directory"
-msgstr "Find sti til midlertidigt bibliotek"
+msgstr "Søg efter flersidet projektbibliotek"
 
 #. DESC_MULTIPAGE_FILETYPE
 msgid "Select filetype for multipage file"
@@ -1777,11 +1762,11 @@ msgstr "Sæt zoomfaktor"
 
 #. DESC_ZOOM_X
 msgid "Set zoomfactor for x direction"
-msgstr "Sæt zommfaktor for x-retning"
+msgstr "Sæt zoomfaktor for x-retning"
 
 #. DESC_ZOOM_Y
 msgid "Set zoomfactor for y direction"
-msgstr "Sæt zommfaktor for y-retning"
+msgstr "Sæt zoomfaktor for y-retning"
 
 #. DESC_COPY_NUMBER
 msgid "Set number of copies"
@@ -1858,9 +1843,8 @@ msgstr ""
 " kontrast = 0"
 
 #. DESC_ENH_AUTO
-#, fuzzy
 msgid "Autoadjust gamma, brightness and contrast <Ctrl-a>"
-msgstr "Autojuster gamma, lyshed og kontrast <Ctrl-e>"
+msgstr "Autojustér gamma, lyshed og kontrast <Ctrl-a>"
 
 #. DESC_ENH_DEFAULT
 msgid ""
@@ -1977,23 +1961,22 @@ msgstr "Supplerende gammaværdi for fotokopiering, blå farvedel"
 
 #. DESC_PRINTER_EMBED_CSA
 msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-msgstr ""
+msgstr "Danner en postscriptfil der indeholder ICM-profilen for skanneren"
 
 #. DESC_PRINTER_EMBED_CRD
 msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-msgstr ""
+msgstr "Danner en postscriptfil der indeholder ICM-profilen for printeren"
 
 #. DESC_PRINTER_CMS_BPC
 msgid "Applies black point compensation"
-msgstr ""
+msgstr "Tilføjer sort punkt kompensation"
 
 #. DESC_PRINTER_PS_FLATEDECODED
-#, fuzzy
 msgid ""
 "Create zlib compressed postscript image for printer (flatedecode).\n"
 "The printer has to understand postscript level 3!"
 msgstr ""
-"Dan zlib-komprimeret postscript billede til printer (flatdecode).\n"
+"Dan zlib-komprimeret postscript-billede til printer (flatedecode).\n"
 "Printeren skal kunne håndtere postscript level 3!"
 
 #. DESC_TMP_PATH
@@ -2006,34 +1989,34 @@ msgstr "Find sti til midlertidigt bibliotek"
 
 #. DESC_JPEG_QUALITY
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
-"Kvalitet i procent, hvis billede gemmes som jpeg eller som tiff med jpeg "
+"Kvalitet i procent, hvis billede gemmes som JPEG eller som TIFF med JPEG "
 "kompression"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
-msgstr "Kompression hvis billedet gemmes som png"
+msgid "Compression if image is saved as PNG"
+msgstr "Kompression hvis billedet gemmes som PNG"
 
 #. DESC_FILENAME_COUNTER_LEN
 msgid "Minimum length of counter in filename"
 msgstr "Minimumlængde af tæller i filnavn"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
-msgstr "ZIP-kompressionsgrad når billedet gemmes i komprimeret TIFF-format"
+msgid "Compression rate for zip compressed TIFF (deflate)"
+msgstr "Kompressionsgrad for zip komprimeret TIFF (deflation)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
-msgstr "Kompressionstype, hvis 16 bit billede gemmes i tiff format"
+msgid "Compression type if 16 bit image is saved as TIFF"
+msgstr "Kompressionstype, hvis 16 bit billede gemmes som TIFF"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
-msgstr "Kompressionstype hvis 8 bit gemmes i tiff format"
+msgid "Compression type if 8 bit image is saved as TIFF"
+msgstr "Kompressionstype hvis 8 bit billede gemmes som TIFF"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
-msgstr "Kompressionstype når stregtegningsbilleder gemmes i TIFF"
+msgid "Compression type if lineart image is saved as TIFF"
+msgstr "Kompressionstype når stregtegningsbilleder gemmes som TIFF"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device dependant preferences in default file at exit of xsane"
@@ -2049,37 +2032,35 @@ msgid ""
 msgstr "Hvis filnavntæller øges automatisk, bliver brugte numre forbigået"
 
 #. DESC_SAVE_PS_FLATEDECODED
-#, fuzzy
 msgid ""
 "compress postscript image with zlib algorithm (flatedecode). When you want "
 "to print such a file your printer has to understand postscript level 3"
 msgstr ""
-"komprimér postscript-billede med zlib-algoritme (flatdecode). Når en fil af "
-"denne type skal udskrives, skal printeren kunne forstå postscript level 3"
+"komprimér postscript-billede med zlib-algoritme (fladafkodning). Når en fil "
+"af denne type skal udskrives, skal printeren kunne forstå postscript level 3"
 
 #. DESC_SAVE_PDF_FLATEDECODED
-#, fuzzy
 msgid "compress PDF image with zlib algorithm (flatedecode)."
-msgstr "komprimér PDF-billede med zlib-algoritme (flatdecode)."
+msgstr "komprimér PDF-billede med zlib-algoritme (fladafkodning)."
 
 #. DESC_SAVE_PNM16_AS_ASCII
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
-"Hvis et 16-bit billede skal gemmes i pnm format, bruges ascii format i "
-"stedet for binær format. Det binære format er et nyt format, der ikke "
-"understøttes af alle programmer. Ascii formatet er understøttet af flere "
+"Hvis et 16-bit billede skal gemmes i PNM format, bruges ASCII format i "
+"stedet for binært format. Det binære format er et nyt format, der ikke "
+"understøttes af alle programmer. ASCII formatet er understøttet af flere "
 "programmer, men det producerer ret store filer!!!"
 
 #. DESC_REDUCE_16BIT_TO_8BIT
-#, fuzzy
 msgid ""
 "If scanner sends image with 16 bits/channel save image with 8 bits/channel"
 msgstr ""
-"Hvis skanner sender billede med 16 bit/farve gemmes billedet med 8 bit/farve"
+"Hvis skanneren sender billede med 16 bit/farve gemmes billedet med 8 bit/"
+"farve"
 
 #. DESC_PSFILE_WIDTH
 msgid "Width of paper for postscript files"
@@ -2108,9 +2089,8 @@ msgstr ""
 "hovedvinduesstørrelse"
 
 #. DESC_DISABLE_GIMP_PREVIEW_GAMMA
-#, fuzzy
 msgid "Disable preview gamma when XSane runs as GIMP plugin"
-msgstr "Deaktiver forhåndsvisningsgamma, når XSane kører som et GIMP plugin"
+msgstr "Deaktivér forhåndsvisningsgamma, når XSane kører som et GIMP plugin"
 
 #. DESC_PREVIEW_COLORMAP
 msgid "Use an own colormap for preview if display depth is 8 bpp"
@@ -2122,7 +2102,7 @@ msgid "Select how a range is displayed"
 msgstr "Vælg hvordan et område vises"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr ""
 "Værdi, med hvilken den beregnede forhåndsvisningsopløsning er multipliceret"
 
@@ -2153,7 +2133,7 @@ msgid ""
 msgstr ""
 "Vælg gråskala skanningstilstand. Denne skanningstilstand bruges til "
 "stregtegnings forhåndsvisning når transformation fra gråskala til "
-"stregtegning er valgt."
+"stregtegning er valgt"
 
 #. DESC_PREVIEW_THRESHOLD_MIN
 #, no-c-format
@@ -2191,30 +2171,30 @@ msgstr ""
 
 #. DESC_DOC_VIEWER
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
-"Komando der skal udføres for at vise hjælpefiler - skal være en html viser!"
+"Angiv den Komando der skal udføres for at vise hjælpefiler - skal være en "
+"HTML-viser!"
 
 #. DESC_AUTOENHANCE_GAMMA
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Skift gammaværdi, når autoforbedringsknappen trykkes"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
-msgstr "Vælg skanområde, når forhåndsvisning er gennemført"
+#. DESC_PRESELECT_SCAN_AREA
+msgid "Select scan area after preview scan has finished"
+msgstr "Vælg skanområde når forhåndsvisning er gennemført"
 
 #. DESC_AUTOCORRECT_COLORS
 msgid "Do color correction after preview scan has finished"
 msgstr "Udfør farvekorrektion, når forhåndsvisning er gennemført"
 
 #. DESC_RENDERING_INTENT
-#, fuzzy
 msgid "Select rendering intent for preview and saving"
-msgstr "Vælg skanområde, når forhåndsvisning er gennemført"
+msgstr "Vælg rendering intent for forhåndsvisning og gemning"
 
 #. DESC_CMS_BPC
 msgid "Apply black point compensation when color transformation is done"
-msgstr ""
+msgstr "Tilføj sortpunktskompensation når farvetransformation er færdig"
 
 #. DESC_FAX_COMMAND
 msgid "Enter command to be executed in fax mode"
@@ -2246,9 +2226,8 @@ msgid "Send fax with high vertical resolution (196 lpi instead of 98 lpi)"
 msgstr "Send fax med høj lodret opløsning (196 lpi i stedet for 98 lpi)"
 
 #. DESC_FAX_PS_FLATEDECODED
-#, fuzzy
 msgid "Create zlib compressed postscript image for fax (flatedecode)"
-msgstr "Dan zlib-komprimeret postscript billede til fax (flatdecode)"
+msgstr "Dan zlib-komprimeret postscript billede til fax (fladafkodning)"
 
 #. DESC_SMTP_SERVER
 msgid "IP Address or Domain name of SMTP server"
@@ -2287,30 +2266,30 @@ msgid "port to connect to POP3 server"
 msgstr "port til forbindelse til POP3 server"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
-msgstr "E-post er sendt i html tilstand, placér billede med: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
+msgstr "E-post er sendt i HTML tilstand, placér billede med: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
-msgstr "Indtast komando for at starte tekstgenkendelsesprogram"
+msgid "Enter command to start OCR program"
+msgstr "Indtast kommando til at starte tekstgenkendelsesprogram"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+msgid "Enter option of the OCR program to define input file"
 msgstr ""
 "Indtast indstillinger for tekstgenkendelsesprogram for at definere inddatafil"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+msgid "Enter option of the OCR program to define output file"
 msgstr ""
 "Indtast indstillinger for tekstgenkendelsesprogram for at definere uddatafil"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Angiv om tekstgenkendelsesprogrammet understøtter GUI fremskridtsrør"
 
 #. DESC_OCR_OUTFD_OPT
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Angiv indstilling for tekstgenkendelsesprogrammet, til definering af uddata "
 "filbeskrivelse i GUI tilstand"
@@ -2328,9 +2307,8 @@ msgid "write"
 msgstr "skriv"
 
 #. DESC_PERMISSION_SEARCH
-#, fuzzy
 msgid "search"
-msgstr "bruger"
+msgstr "søg"
 
 #. DESC_ADD_BATCH
 msgid "Add selection for batch scan"
@@ -2349,7 +2327,7 @@ msgid "Pick black point"
 msgstr "Vælg sort punkt"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+msgid "Use full scan area"
 msgstr "Brug fuldt skanområde"
 
 #. DESC_ZOOM_OUT
@@ -2373,12 +2351,12 @@ msgstr "Fortryd sidste zoom"
 msgid "Select visible area"
 msgstr "Vælg synligt område"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+msgid "Autoselect scan area"
 msgstr "Autovælg skanområde"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+msgid "Autoraise scan area"
 msgstr "Autoudvid skanområde"
 
 #. DESC_DELETE_IMAGES
@@ -2388,12 +2366,12 @@ msgstr "Slet forhåndsvisningscache"
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Forvalgt område:\n"
-"For at tilføje et nyt område, eller rette et eksisterende område bruges "
-"genvejsmenuen (højre musetaste)."
+"For at tilføje et nyt eller rette i et eksisterende område bruges "
+"kontekstmenuen (alternativt musetaste)."
 
 #. DESC_ROTATION
 msgid "Rotate preview and scan"
@@ -2420,15 +2398,15 @@ msgid "Clone image"
 msgstr "Klon billede"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+msgid "Rotate image 90 degrees"
 msgstr "Rotér billede 90 grader"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+msgid "Rotate image 180 degrees"
 msgstr "Rotér billede 180 grader"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+msgid "Rotate image 270 degrees"
 msgstr "Rotér billede 270 grader"
 
 #. DESC_MIRROR_X
@@ -2464,12 +2442,12 @@ msgid "Y-Scale factor"
 msgstr "Skaleringsfaktor Y-retning"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
-msgstr "Skalér billede til bredde [i pixler]"
+msgid "Scale image to width [pixels]"
+msgstr "Skalér billede til bredde [pixler]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
-msgstr "Skalér billede til højde [i pixler]"
+msgid "Scale image to height [pixels]"
+msgstr "Skalér billede til højde [pixler]"
 
 #. DESC_BATCH_LIST_EMPTY
 msgid "Empty batch list"
@@ -2500,34 +2478,28 @@ msgid "Turns on automatic mode"
 msgstr "Tænder for automatisk tilstand"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_COLOR_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for scanner default color ICM-profile"
-msgstr "Søg efter billed filnavn"
+msgstr "Søg efter skanners standard farve ICM-profil"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_GRAY_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for scanner default gray ICM-profile"
-msgstr "Søg efter billed filnavn"
+msgstr "Søg efter skanners standard grå ICM-profil"
 
 #. DESC_BUTTON_DISPLAY_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for display ICM-profile"
-msgstr "Søg efter billed filnavn"
+msgstr "Søg efter skærm ICM-profil"
 
 #. DESC_BUTTON_PRINTER_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for printer ICM-profile"
-msgstr "Søg efter billed filnavn"
+msgstr "Søg efter printer ICM-profil"
 
 #. DESC_BUTTON_CUSTOM_PROOFING_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for custom proofing ICM-profile"
-msgstr "Søg efter billed filnavn"
+msgstr "Søg efter bruger test ICM-profil"
 
 #. DESC_BUTTON_WORKING_COLOR_SPACE_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for working color space ICM-profile"
-msgstr "Søg efter billed filnavn"
+msgstr "Søg efter arbejds-farverum ICM-profil"
 
 #. ERR_HOME_DIR
 msgid "Failed to determine home directory:"
@@ -2548,6 +2520,10 @@ msgid ""
 "select a temporary directory where you have\n"
 "write permissions."
 msgstr ""
+"Kunne ikke danne midlertidig fil.\n"
+"Åbn Menu Indstillinger->Opsætning Tab Gem og\n"
+"vælg et midlertidigt bibliotek hvor du har\n"
+"skrive rettigheder."
 
 #. ERR_SET_OPTION
 msgid "Failed to set value of option"
@@ -2590,7 +2566,7 @@ msgid "Failed to open"
 msgstr "Kunne ikke åbne"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Kunne ikke danne sikker fil (måske eksisterer der et link):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2647,7 +2623,7 @@ msgstr "ukendt forpligtende type"
 
 #. ERR_OPTION_NAME_NULL
 msgid "Option has empty name (NULL)."
-msgstr "Indstilling har tomt navn (NULL)"
+msgstr "Indstilling har tomt navn (NULL)."
 
 #. ERR_BACKEND_BUG
 msgid "This is a backend bug. Please inform the author of the backend!"
@@ -2655,7 +2631,7 @@ msgstr "Dette er en bagende fejl. Underret forfatteren af bagenden!"
 
 #. ERR_FAILED_EXEC_DOC_VIEWER
 msgid "Failed to execute documentation viewer:"
-msgstr "Kunne ikke udføre dokument-viser"
+msgstr "Kunne ikke udføre dokument-viser:"
 
 #. ERR_FAILED_EXEC_FAX_VIEWER
 msgid "Failed to execute fax viewer:"
@@ -2666,8 +2642,8 @@ msgid "Failed to execute fax command:"
 msgstr "Kunne ikke udføre fax kommando:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Kunne ikke udføre tekstgenkendelses kommando:"
+msgid "Failed to execute OCR command:"
+msgstr "Kunne ikke udføre tekstgenkendelses-kommando:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2731,13 +2707,14 @@ msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
-"Du prøver at køre XSane som ROOT, det ER meget farligt!\n"
+"Du prøver at køre XSane som ROOT, det ER meget FARLIGT!\n"
 "\n"
-"Du skal ikke sende bug-rapporter hvis du har problemer,\n"
-"når du kører XSane som root:    DU ER HELT ALENE!"
+"Du skal ikke sende bug-rapporter\n"
+"hvis du får problemer når du kører XSane som root:\n"
+"DU ER HELT ALENE!"
 
 #. ERR_HEADER_ERROR
 msgid "Error"
@@ -2813,34 +2790,28 @@ msgid "Unsupported %d-bit output format: %s"
 msgstr "Ikke understøttet %d-bit uddataformat: %s"
 
 #. ERR_CMS_CONVERSION
-#, fuzzy
 msgid "Error during CMS conversion:"
-msgstr "Fejl under skrivning:"
+msgstr "Fejl under CMS omformning:"
 
 #. ERR_CMS_OPEN_ICM_FILE
-#, fuzzy
 msgid "Could not open"
 msgstr "Kunne ikke åbne"
 
 #. CMS_SCANNER_ICM
-#, fuzzy
 msgid "scanner ICM profile"
-msgstr "Slet printer"
+msgstr "skanner ICM-profil"
 
 #. CMS_DISPLAY_ICM
-#, fuzzy
 msgid "display ICM profile"
-msgstr "Søg efter billed filnavn"
+msgstr "vis ICM-profil"
 
 #. CMS_PROOF_ICM
-#, fuzzy
 msgid "proofing ICM profile"
-msgstr "Slet printer"
+msgstr "test ICM-profil"
 
 #. ERR_CMS_CREATE_TRANSFORM
-#, fuzzy
 msgid "Could not create transform"
-msgstr "Kunne ikke skabe midlertidig fil"
+msgstr "Kunne ikke danne transformation"
 
 #. WARN_VIEWER_IMAGE_NOT_SAVED
 msgid "viewer image is not saved"
@@ -2848,31 +2819,27 @@ msgstr "viser-billede er ikke gemt"
 
 #. FILE_FILTER_ALL_FILES
 msgid "All files"
-msgstr ""
+msgstr "Alle filer"
 
 #. FILE_FILTER_IMAGES
-#, fuzzy
 msgid "Images"
-msgstr "Sider:"
+msgstr "Billeder"
 
 #. FILE_FILTER_XBL
-#, fuzzy
 msgid "XSane batch list"
-msgstr "Gem batchliste"
+msgstr "XSane batchliste"
 
 #. FILE_FILTER_ICM
 msgid "ICC/ICM Profiles"
-msgstr ""
+msgstr "ICC/ICM Profiler"
 
 #. FILE_FILTER_DRC
-#, fuzzy
 msgid "XSane device preferences"
-msgstr "Gem enhedsindstillinger ved afslutning"
+msgstr "XSane enhedsindstillinger"
 
 #. FILE_FILTER_RC
-#, fuzzy
 msgid "XSane preferences"
-msgstr "Indstillinger"
+msgstr "XSane Indstillinger"
 
 #. TEXT_USAGE
 msgid "Usage:"
@@ -2933,7 +2900,7 @@ msgstr ""
 " -V, --viewer                 start med viser-tilstand aktiveret (default)\n"
 " -s, --save                   start med gem-tilstand aktiveret\n"
 " -c, --copy                   start med kopi-tilstand aktiveret\n"
-" -f, --fax                    start med fax-tilstand aktiveret\n"
+"Saturation -f, --fax                    start med fax-tilstand aktiveret\n"
 " -m, -- flerside               start med flerside-tilstand aktiv\n"
 " -e, --email                   start med e-post-tilstand aktiveret\n"
 " -n, --no-mode-selection      deaktivér menu for XSane tilstand markering\n"
@@ -2989,12 +2956,12 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Mulige grunde:\n"
 "1) Der er virkelig ingen enheder der er understøttet af SANE\n"
-"2) Understøttede enheder er optagede\n"
+"2) Understøttet enhed er optaget\n"
 "3) Enhedsfilens rettigheder tillader dig ikke at bruge den - prøv som root\n"
 "4) Bagenden er ikke indlæst af SANE (man sane-dll)\n"
 "5) Bagenden er ikke konfigureret korrekt (man sane-\"bagendenavn\")\n"
@@ -3008,27 +2975,27 @@ msgstr "fuld størrelse"
 
 #. MENU_ITEM_SURFACE_DIN_A3P
 msgid "DIN A3 port."
-msgstr "DIN A3 portræt"
+msgstr "DIN A3 portræt."
 
 #. MENU_ITEM_SURFACE_DIN_A3L
 msgid "DIN A3 land."
-msgstr "DIN A3 tværformat"
+msgstr "DIN A3 tværformat."
 
 #. MENU_ITEM_SURFACE_DIN_A4P
 msgid "DIN A4 port."
-msgstr "DIN A4 portræt"
+msgstr "DIN A4 portræt."
 
 #. MENU_ITEM_SURFACE_DIN_A4L
 msgid "DIN A4 land."
-msgstr "DIN A4 tværformat"
+msgstr "DIN A4 tværformat."
 
 #. MENU_ITEM_SURFACE_DIN_A5P
 msgid "DIN A5 port."
-msgstr "DIN A5 portræt"
+msgstr "DIN A5 portræt."
 
 #. MENU_ITEM_SURFACE_DIN_A5L
 msgid "DIN A5 land."
-msgstr "DIN A5 tværformat"
+msgstr "DIN A5 tværformat."
 
 #. MENU_ITEM_SURFACE_13cmx18cm
 msgid "13cm x 18cm"
@@ -3056,19 +3023,19 @@ msgstr "13cm x 9cm"
 
 #. MENU_ITEM_SURFACE_legal_P
 msgid "legal port."
-msgstr "legal portræt"
+msgstr "legal portræt."
 
 #. MENU_ITEM_SURFACE_legal_L
 msgid "legal land."
-msgstr "legal tværformat"
+msgstr "legal tværformat."
 
 #. MENU_ITEM_SURFACE_letter_P
 msgid "letter port."
-msgstr "letter portræt"
+msgstr "letter portræt."
 
 #. MENU_ITEM_SURFACE_letter_L
 msgid "letter land."
-msgstr "letter tværformat"
+msgstr "letter tværformat."
 
 #. MENU_ITEM_MEDIUM_FULL_COLOR_RANGE
 msgid "Full color range"
@@ -3183,7 +3150,7 @@ msgid "E-mail has been sent"
 msgstr "E-post er blevet sendt"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+msgid "Queueing fax"
 msgstr "Fax sættes i kø"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3244,62 +3211,3 @@ msgstr "Ikke mere ram"
 
 msgid "Access to resource has been denied"
 msgstr "Adgang til ressource nægtet"
-
-#, fuzzy
-#~ msgid "select scanner transmissive ICM-profile"
-#~ msgstr "Slet printer"
-
-#, fuzzy
-#~ msgid "select scanner transmissive gray ICM-profile"
-#~ msgstr "Slet printer"
-
-#, fuzzy
-#~ msgid "Scanner reflective ICM-profile"
-#~ msgstr "Slet printer"
-
-#, fuzzy
-#~ msgid "Scanner reflective gray ICM-profile"
-#~ msgstr "Slet printer"
-
-#, fuzzy
-#~ msgid "Scanner transmissive gray ICM-profile"
-#~ msgstr "Slet printer"
-
-#, fuzzy
-#~ msgid "Scanner reflektive ICM-profile"
-#~ msgstr "Slet printer"
-
-#, fuzzy
-#~ msgid "Browse for scanner transmissive ICM-profile"
-#~ msgstr "Søg efter billed filnavn"
-
-#, fuzzy
-#~ msgid "Browse for scanner transmissive gray ICM-profile"
-#~ msgstr "Søg efter billed filnavn"
-
-#~ msgid "GIMP can't handle depth %d bits/color"
-#~ msgstr "GIMP understøtter ikke %d bit/farve dybde"
-
-#, fuzzy
-#~ msgid "scanner reflective ICM profile"
-#~ msgstr "Slet printer"
-
-#, fuzzy
-#~ msgid "Embed scanner/source ICM profile for GIMP"
-#~ msgstr "Slet printer"
-
-#~ msgid "Enter name of fax project"
-#~ msgstr "Angiv navn på fax projekt"
-
-#~ msgid "Enter name of e-mail project"
-#~ msgstr "Angiv navn på e-post projekt"
-
-#~ msgid "Enter name of multipage project"
-#~ msgstr "Angiv navn på flerside projekt"
-
-#~ msgid ""
-#~ "Gimp does not support depth 16 bits/color.\n"
-#~ "Do you want to reduce the depth to 8 bits/color?"
-#~ msgstr ""
-#~ "GIMP understøtter ikke 16 bit/farve.\n"
-#~ "Ønsker du at reducere til 8 bit/farve?"
diff --git a/po/de.gmo b/po/de.gmo
index 5ba0538..37bdc7b 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 719009c..da5cbb0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2000-01-21 15:51+01:00\n"
 "Last-Translator: Oliver Rauch <Oliver.Rauch@rauch-domain.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -82,7 +82,7 @@ msgid "rename fax page"
 msgstr "Faxseite umbenennen"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+msgid "insert PS-file into fax"
 msgstr "ps-Datei einfügen in Fax"
 
 #. WINDOW_EMAIL_PROJECT
@@ -494,7 +494,7 @@ msgid "Skip existing filenames"
 msgstr "Existierende Dateinamen überspringen"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr "Speichere Postscript zlib-komprimiert (ps level 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -502,7 +502,7 @@ msgid "Save PDF zlib compressed"
 msgstr "Speichere PDF zlib-komprimiert"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Speichere 16bit pnm im ASCII-Format"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -525,8 +525,8 @@ msgstr "Benutze eigene Farbpalette"
 msgid "Autoenhance gamma"
 msgstr "Automatische Gammakorrektur"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+msgid "Preselect scan area"
 msgstr "Scanbereich automatisch wählen"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -550,10 +550,6 @@ msgstr "Suche nach Geräten"
 msgid "Available devices:"
 msgstr "Erreichbare Geräte:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "XSane Optionen"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Typ"
@@ -877,53 +873,61 @@ msgstr "Befehl:"
 msgid "Copy number option:"
 msgstr "Option for Anzahl der Kopien:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+msgid "Scan resolution:"
+msgstr "Scanauflösung:"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
-msgstr "Lineart Auflösung (dpi):"
+msgid "lineart [dpi]"
+msgstr "Lineart [dpi]"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
-msgstr "Graustufen Auflösung (dpi):"
+msgid "grayscale [dpi]"
+msgstr "Graustufen [dpi]"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Farb-Auflösung (dpi):"
+msgid "color [dpi]"
+msgstr "Farbe [dpi]"
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr "Papiergeometrie:"
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+msgid "width"
 msgstr "Breite"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+msgid "height"
 msgstr "Höhe"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+msgid "left offset"
 msgstr "Linker Rand"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+msgid "bottom offset"
 msgstr "Unterer Rand"
 
-#. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+msgid "Printer gamma:"
 msgstr "Drucker Gammawert:"
 
+#. TEXT_SETUP_PRINTER_GAMMA
+msgid "common value"
+msgstr "gemeinsamer Wert"
+
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Drucker Gammawert rot:"
+msgid "red"
+msgstr "rot"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Drucker Gammawert grün:"
+msgid "green"
+msgstr "grün"
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Drucker Gammawert blau:"
+msgid "blue"
+msgstr "blau"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 msgid "Embed scanner ICM profile as CSA"
@@ -938,7 +942,7 @@ msgid "Apply black point compensation"
 msgstr "Schwarzpunktkompensation anwenden"
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr "Erzeuge zlib-komprimiertes Posctscript Bild (ps level 3) zum Drucken"
 
 #. TEXT_SETUP_TMP_PATH
@@ -1061,8 +1065,24 @@ msgstr "Setze Standardwerte für folgendes Programm"
 msgid "Viewer (Postscript):"
 msgstr "Betrachter (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Breite"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Höhe"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Linker Rand"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Unterer Rand"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr "Erzeuge zlib-komprimiertes Postscript-Bild (ps level 3) zum Faxen"
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1416,11 +1436,11 @@ msgid "CCITT 1D Huffman compression"
 msgstr "CCITT 1D Huffman Kompression"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+msgid "CCITT Group 3 fax compression"
 msgstr "CCITT Gruppe 3 Fax Kompression"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+msgid "CCITT Group 4 fax compression"
 msgstr "CCITT Gruppe 4 Fax Kompression"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1544,8 +1564,8 @@ msgstr "Empfange %s Daten"
 msgid "page"
 msgstr "Seite"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+msgid "Transferring image"
 msgstr "Bild übertragen"
 
 #. PROGRESS_ROTATING_DATA
@@ -1619,14 +1639,14 @@ msgstr ""
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
 msgstr ""
 "Quellmedium auswählen.\n"
 "Zum Umbenennen, Umsortieren oder Löschen eines Eintrags das Kontextmenü "
-"benutzen (rechter Mausknopf).\n"
+"benutzen (alternativer Mausknopf).\n"
 "Um ein neues Medium zu erzeugen, Option Medium ändern im Einstellungsmenü "
 "aktivieren."
 
@@ -1971,13 +1991,13 @@ msgstr "Nach temporärem Verzeichnis suchen"
 
 #. DESC_JPEG_QUALITY
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Qualität in Prozent wenn Bild als JPEG oder als TIFF mit JPEG-Kompression "
 "gespeichert wird"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+msgid "Compression if image is saved as PNG"
 msgstr "Kompression wenn Bild im PNG-Format gespeichert wird"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -1985,20 +2005,20 @@ msgid "Minimum length of counter in filename"
 msgstr "Minimale Länge des Zählers im Dateinamen"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr ""
 "ZIP-Kompressionsrate wenn Bild im komprimierten TIFF-Format gespeichert wird"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Kompression wenn 16 bit Bild im TIFF-Format gespeichert wird"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Kompression wenn 8 bit Bild im TIFF-Format gespeichert wird"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Kompression wenn lineart Bild im TIFF-Format gespeichert wird"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2032,9 +2052,9 @@ msgstr "komprimiere PDF Bild mit zlib Algorithmus (flatedecode)."
 
 #. DESC_SAVE_PNM16_AS_ASCII
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Speicher 16 Bit PNM-Bilder im ASCII Format anstatt im Binär Format. Das "
@@ -2092,7 +2112,7 @@ msgid "Select how a range is displayed"
 msgstr "Bestimmen Sie, wie die Auswahle eines Bereichs dargestellt wird"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Wert, mit dem die berechnete Vorschauauflösung multipliziert wird"
 
 #. DESC_PREVIEW_GAMMA
@@ -2160,7 +2180,7 @@ msgstr ""
 
 #. DESC_DOC_VIEWER
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Befehl, der ausgeführt werden soll, um Hilfedateien anzuzeigen, muß ein HTML-"
 "Betrachter sein!"
@@ -2171,8 +2191,8 @@ msgstr ""
 "Gamma Wert wird angepasst wenn Knopf für automatische Verbesserung gedrückt "
 "wird"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+msgid "Select scan area after preview scan has finished"
 msgstr "Scanbereich nach Vorschauscan automatisch auswählen"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2259,29 +2279,29 @@ msgid "port to connect to POP3 server"
 msgstr "Port, auf dem zum POP3-Server verbunden werden soll"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "E-Mail wird im hmtl Modus gesandt, Bild platzieren mit: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+msgid "Enter command to start OCR program"
 msgstr "OCR Befehl eingeben"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+msgid "Enter option of the OCR program to define input file"
 msgstr "Eingabe-Datei-Option für OCR Programm eingeben"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+msgid "Enter option of the OCR program to define output file"
 msgstr "Ausgabe-Datei-Option für OCR Programm eingeben"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr ""
 "Definieren Sie, ob das OCR Programm eine GUI-Fortschritts-Pipe unterstützt"
 
 #. DESC_OCR_OUTFD_OPT
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Geben Sie die Option des OCR Programms ein, mit der der Ausgabefildeskriptor "
 "im GUI Mode übergeben wird"
@@ -2321,7 +2341,7 @@ msgid "Pick black point"
 msgstr "Wähle schwarzen Punkt"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+msgid "Use full scan area"
 msgstr "Zoomt auf kompletten Scanbereich"
 
 #. DESC_ZOOM_OUT
@@ -2345,12 +2365,12 @@ msgstr "letzten Zoom rückgängig machen"
 msgid "Select visible area"
 msgstr "Sichtbaren Bereich auswählen"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+msgid "Autoselect scan area"
 msgstr "Scanbereich automatisch wählen"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+msgid "Autoraise scan area"
 msgstr "Scanbereich automatisch aufziehen"
 
 #. DESC_DELETE_IMAGES
@@ -2360,12 +2380,12 @@ msgstr "Vorschau Speicher löschen"
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Bereichsvoreinstellung:\n"
 "Um einen neuen Bereich hinzuzufügen oder existierende Voreinstellungen zu "
-"ändern verwenden Sie das Kontextmenü (rechter Mausknopf)."
+"ändern verwenden Sie das Kontextmenü (alternativer Mausknopf)."
 
 #. DESC_ROTATION
 msgid "Rotate preview and scan"
@@ -2392,15 +2412,15 @@ msgid "Clone image"
 msgstr "Bild clonen"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+msgid "Rotate image 90 degrees"
 msgstr "Drehe Bild um 90 Grad"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+msgid "Rotate image 180 degrees"
 msgstr "Drehe Bild um 180 Grad"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+msgid "Rotate image 270 degrees"
 msgstr "Drehe Bild um 270 Grad"
 
 #. DESC_MIRROR_X
@@ -2436,11 +2456,11 @@ msgid "Y-Scale factor"
 msgstr "Vergrößerungsfaktor Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+msgid "Scale image to width [pixels]"
 msgstr "Bild auf Breite [in Pixeln] skalieren"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+msgid "Scale image to height [pixels]"
 msgstr "Bild auf Höhe [in Pixeln] skalieren"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2560,7 +2580,7 @@ msgid "Failed to open"
 msgstr "Fehler beim Öffnen von"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr ""
 "Konnte keine sichere Datei erzeugen (möglicherweise existiert ein Link):"
 
@@ -2638,7 +2658,7 @@ msgid "Failed to execute fax command:"
 msgstr "Konnte Faxbefehl nicht ausführen:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
+msgid "Failed to execute OCR command:"
 msgstr "Konnte OCR-Befehl nicht ausführen:"
 
 #. ERR_BAD_FRAME_FORMAT
@@ -2703,7 +2723,7 @@ msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Sie versuchen XSane als ROOT auszuführen,\n"
@@ -2949,7 +2969,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Mögliche Gründe:\n"
@@ -3144,7 +3164,7 @@ msgid "E-mail has been sent"
 msgstr "E-Mail wurde gesendet"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+msgid "Queueing fax"
 msgstr "Fax zum Senden einreihen"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3205,3 +3225,9 @@ msgstr "Kein Speicher"
 
 msgid "Access to resource has been denied"
 msgstr "Zugang zum Gerät wurde verweigert"
+
+#~ msgid "XSane options"
+#~ msgstr "XSane Optionen"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Konnte OCR-Befehl nicht ausführen:"
diff --git a/po/es.gmo b/po/es.gmo
index d32ccf3..aaa4c19 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index fb52b85..6b426f6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2004-08-22 19:15GMT\n"
 "Last-Translator: Gustavo D. Vranjes <gvranjes@SoftHome.net>\n"
 "Language-Team: Castellano <es@li.org>\n"
@@ -86,7 +86,8 @@ msgid "rename fax page"
 msgstr "renombrar página de fax"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "insertar archivo-ps dentro de fax"
 
 #. WINDOW_EMAIL_PROJECT
@@ -511,7 +512,7 @@ msgid "Skip existing filenames"
 msgstr "Omitir nombres de archivos existentes"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -519,7 +520,8 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Guardar 16bit pnm en formato ascii"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -543,8 +545,9 @@ msgstr "Usar mapa de colores privado"
 msgid "Autoenhance gamma"
 msgstr "Automejorar gamma"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Preseleccionar área de escaneado"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -568,10 +571,6 @@ msgstr "Escaneando dispositivos"
 msgid "Available devices:"
 msgstr "Dispositivos disponibles:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Opciones de XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Tipo"
@@ -904,53 +903,72 @@ msgstr "Comando:"
 msgid "Copy number option:"
 msgstr "Copiar opción número:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Establecer resolución de escaneo"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Resolución de línea de arte (ppp):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Resolución de tonos de gris (ppp):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Resolución de color (ppp):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Anchura"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Altura"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Desplazamiento a izquierda"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Desplazamiento hacia abajo"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Gamma rojo de impresora:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Valor de gamma de impresora:"
+#, fuzzy
+msgid "common value"
+msgstr "Valores recientes:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Gamma rojo de impresora:"
+#, fuzzy
+msgid "red"
+msgstr "leer"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Gamma verde de impresora:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Gamma azul de impresora:"
+#, fuzzy
+msgid "blue"
+msgstr "Desenfoque"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -967,7 +985,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1091,8 +1109,24 @@ msgstr "Establecer por defecto para:"
 msgid "Viewer (Postscript):"
 msgstr "Visor (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Anchura"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Altura"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Desplazamiento a izquierda"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Desplazamiento hacia abajo"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1464,11 +1498,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "Compresión CCITT 1D Huffman"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "Compresión CCITT Grupo 3 Fax"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "Compresión CCITT Grupo 4 Fax"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1597,8 +1633,9 @@ msgstr "Recibiendo datos %s"
 msgid "page"
 msgstr "paquete"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Transfiriendo imagen"
 
 #. PROGRESS_ROTATING_DATA
@@ -1672,9 +1709,10 @@ msgstr ""
 "electrónico-<Ctrl-m>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2036,14 +2074,16 @@ msgid "Browse for temporary directory"
 msgstr "Explorar para directorio temporal"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Calidad en porcentaje si la imagen es guardada como jpeg ó tiff con "
 "compresión jpeg"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Compresión si la imagen es guardada como png"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2052,19 +2092,22 @@ msgstr "Medida mínima del contador en el nombre de archivo"
 
 #. DESC_TIFF_ZIP_COMPRESSION
 #, fuzzy
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Tipo de compresión si la imagen de 8 bits es guardada como tiff"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Tipo de compresión si la imagen de 16 bits es guardada como tiff"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Tipo de compresión si la imagen de 8 bits es guardada como tiff"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Tipo de compresión si la imagen de línea de arte es guardada como tiff"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2095,10 +2138,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Cuando una imagen de 16 bits deba guardarse en formato pnm use el formato "
@@ -2161,7 +2205,8 @@ msgid "Select how a range is displayed"
 msgstr "Seleccionar cómo se muestra un rango"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Valor con el que la resolución de la vista previa es multiplicado"
 
 #. DESC_PREVIEW_GAMMA
@@ -2235,8 +2280,9 @@ msgstr ""
 "pipeta"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Ingresar comando a ser ejecutado para mostrar archivos de ayuda, ¡debe ser "
 "un visualizador html!"
@@ -2245,8 +2291,9 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Cambiar valor de gamma cuando el botón de automejora es presionado"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr ""
 "Seleccionar área de escaneo después de que la previsualización ha concluído"
 
@@ -2342,30 +2389,35 @@ msgstr "puerto a conectar al servidor POP3"
 
 #. DESC_HTML_EMAIL
 #, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr ""
 "El correo electrónico se envía en modo html, coloque la imagen con: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Ingresar comando para lanzar programa de OCR"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr ""
 "Ingresar opción para el programa de OCR para definir archivo de entrada"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "ngresar opción para el programa de OCR para definir archivo de salida"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Definir si el programa de ocr soporta tubería de proceso GUI"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Ingresar opción para el programa de ocr para definir descriptor de archivo "
 "de salida en modo GUI"
@@ -2404,7 +2456,8 @@ msgid "Pick black point"
 msgstr "Tomar punto negro"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Usar área de escaneo completa"
 
 #. DESC_ZOOM_OUT
@@ -2428,12 +2481,14 @@ msgstr "Deshacer última ampliación"
 msgid "Select visible area"
 msgstr "Seleccionar area visible"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Autoseleccionar área de escaneado"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Autoseleccionar área de escaneado"
 
 #. DESC_DELETE_IMAGES
@@ -2441,9 +2496,10 @@ msgid "Delete preview image cache"
 msgstr "Borrar cache de imagen de previsualización"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Área de preset:\n"
@@ -2475,15 +2531,18 @@ msgid "Clone image"
 msgstr "Clonar imagen"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Rotar imagen 90 grados"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Rotar imagen 180 grados"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Rotar imagen 270 grados"
 
 #. DESC_MIRROR_X
@@ -2519,11 +2578,13 @@ msgid "Y-Scale factor"
 msgstr "Factor de Escala Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Escalar imagen a ancho [en pixels]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Escalar imagen a alto [en pixels]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2645,7 +2706,8 @@ msgid "Failed to open"
 msgstr "Falló al abrir"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "No se puede crear un archivo seguro (puede ser que exista un link):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2722,8 +2784,9 @@ msgid "Failed to execute fax command:"
 msgstr "Falló al ejecutar comando de fax:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Falló al ejecutar comando de OCR:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Falló al ejecutar comando de fax:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2783,11 +2846,12 @@ msgid "warning: option has no value constraint"
 msgstr "advertencia: la opción no tiene restricciones de valor"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "¡Usted intenta ejecutar XSane como ROOT, es verdaderamente PELIGROSO!\n"
@@ -3046,6 +3110,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Toolbox>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -3053,7 +3118,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Razones posibles:\n"
@@ -3259,7 +3324,8 @@ msgid "E-mail has been sent"
 msgstr "El correo electrónico se envió"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Poniendo el fax en la cola de envío"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3321,6 +3387,24 @@ msgstr "Sin memoria"
 msgid "Access to resource has been denied"
 msgstr "Acceso al recurso fue prohibido"
 
+#~ msgid "XSane options"
+#~ msgstr "Opciones de XSane"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Falló al ejecutar comando de OCR:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Resolución de color (ppp):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Valor de gamma de impresora:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Gamma verde de impresora:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Gamma azul de impresora:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Borrar impresora"
diff --git a/po/fi.gmo b/po/fi.gmo
new file mode 100644
index 0000000..539363d
--- /dev/null
+++ b/po/fi.gmo
diff --git a/po/de.po~ b/po/fi.po
index 8bf8dc9..64cc0e5 100644
--- a/po/de.po~
+++ b/po/fi.po
@@ -1,15 +1,18 @@
-# German translation for XSane.
-# Copyright (C) 1999-2002 Oliver Rauch
-# Oliver Rauch <Oliver.Rauch@rauch-domain.de>
+# Finnish translation for xsane
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the xsane package.
+# Elias Julkunen <elias.julkunen@gmail.com>, 2006
+# Timo Jyrinki <timo.jyrinki@iki.fi>, 2007
+# Antti Kajander <antti.kajander@gmail.com>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: XSANE 0.99\n"
+"Project-Id-Version: xsane\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
-"PO-Revision-Date: 2000-01-21 15:51+01:00\n"
-"Last-Translator: Oliver Rauch <Oliver.Rauch@rauch-domain.de>\n"
-"Language-Team: German <de@li.org>\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
+"PO-Revision-Date: 2007-11-19 10:39+0200\n"
+"Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
+"Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,687 +20,687 @@ msgstr ""
 #. Please translate this to the correct directory name (eg. german=>de)
 #. XSANE_LANGUAGE_DIR
 msgid "language_dir"
-msgstr "de"
+msgstr "fi"
 
 #. XSANE_COPYRIGHT_SIGN
 msgid "(c)"
-msgstr "©"
+msgstr "(c)"
 
 #. can be translated with \251
 #. FILENAME_PREFIX_CLONE_OF
 msgid "clone-of-"
-msgstr "Duplikat-von-"
+msgstr ""
 
 #. WINDOW_ABOUT_XSANE
 msgid "About"
-msgstr "Über"
+msgstr "Tietoa"
 
 #. WINDOW_ABOUT_TRANSLATION, MENU_ITEM_ABOUT_TRANSLATION
 #. MENU_ITEM_ABOUT_TRANSLATION
 msgid "About translation"
-msgstr "Über Übersetzung"
+msgstr "Tietoa käännöksestä"
 
 #. WINDOW_AUTHORIZE
 msgid "authorization"
-msgstr "Autorisation"
+msgstr ""
 
 #. WINDOW_GPL
 msgid "GPL - the license"
-msgstr "GPL - die Lizenz"
+msgstr "GPL-lisenssi"
 
 #. WINDOW_EULA
 msgid "End User License Agreement"
-msgstr "Endbenutzervereinbarung (EULA)"
+msgstr ""
 
 #. WINDOW_INFO
 msgid "info"
-msgstr "Informationen"
+msgstr ""
 
 #. WINDOW_LOAD_BATCH_LIST
 msgid "load batch list"
-msgstr "Stapelliste laden"
+msgstr ""
 
 #. WINDOW_SAVE_BATCH_LIST
 msgid "save batch list"
-msgstr "Stapelliste speichern"
+msgstr ""
 
 #. WINDOW_BATCH_SCAN
 msgid "batch scan"
-msgstr "Stapel Scan"
+msgstr ""
 
 #. WINDOW_BATCH_RENAME
 msgid "rename batch area"
-msgstr "Stapelscan Bereich umbenennen"
+msgstr ""
 
 #. WINDOW_FAX_PROJECT
 msgid "fax project"
-msgstr "Faxprojekt"
+msgstr ""
 
 #. WINDOW_FAX_PROJECT_BROWSE
+#, fuzzy
 msgid "browse for fax project"
-msgstr "Nach Faxprojekt suchen"
+msgstr "Syötä faksiprojektin nimi"
 
 #. WINDOW_FAX_RENAME
 msgid "rename fax page"
-msgstr "Faxseite umbenennen"
+msgstr ""
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
-msgstr "ps-Datei einfügen in Fax"
+msgid "insert PS-file into fax"
+msgstr ""
 
 #. WINDOW_EMAIL_PROJECT
 msgid "E-mail project"
-msgstr "E-Mail Projekt"
+msgstr ""
 
 #. WINDOW_EMAIL_PROJECT_BROWSE
+#, fuzzy
 msgid "browse for email project"
-msgstr "Nach E-Mailprojekt suchen"
+msgstr "Projektia luettaessa tapahtui virhe"
 
 #. WINDOW_EMAIL_RENAME
 msgid "rename e-mail image"
-msgstr "E-Mail Bild umbenennen"
+msgstr ""
 
 #. WINDOW_EMAIL_INSERT
 msgid "insert file into e-mail"
-msgstr "Bild in E-Mail einfügen"
+msgstr ""
 
 #. WINDOW_MULTIPAGE_PROJECT
 msgid "multipage project"
-msgstr "Mehrseiten-Projekt"
+msgstr ""
 
 #. WINDOW_MULTIPAGE_PROJECT_BROWSE
+#, fuzzy
 msgid "browse for multipage project"
-msgstr "Nach Mehrseiten-Projekt suchen"
+msgstr "Selaa väliaikaistiedostoja"
 
 #. WINDOW_PRESET_AREA_RENAME
 msgid "rename preset area"
-msgstr "Bereichsvoreinstellung umbenennen"
+msgstr ""
 
 #. WINDOW_PRESET_AREA_ADD
 msgid "add preset area"
-msgstr "Bereichsvoreinstellung hinzufügen"
+msgstr ""
 
 #. WINDOW_MEDIUM_RENAME
 msgid "rename medium"
-msgstr "Medium umbenennen"
+msgstr ""
 
 #. WINDOW_MEDIUM_ADD
 msgid "add new medium"
-msgstr "Medium hinzufügen"
+msgstr ""
 
 #. WINDOW_SETUP
 msgid "setup"
-msgstr "Konfiguration"
+msgstr ""
 
 #. WINDOW_HISTOGRAM
 msgid "Histogram"
-msgstr "Histogramm"
+msgstr "Histogrammi"
 
 #. WINDOW_GAMMA
 msgid "Gamma curve"
-msgstr "Gamma Kurve"
+msgstr "Gamma-käyrä"
 
 #. WINDOW_STANDARD_OPTIONS
 msgid "Standard options"
-msgstr "Standard Optionen"
+msgstr "Perusasetukset"
 
 #. WINDOW_ADVANCED_OPTIONS
 msgid "Advanced options"
-msgstr "Erweiterte Optionen"
+msgstr "Lisäasetukset"
 
 #. WINDOW_DEVICE_SELECTION
 msgid "device selection"
-msgstr "Geräteauswahl"
+msgstr ""
 
 #. WINDOW_PREVIEW
 msgid "Preview"
-msgstr "Vorschau"
+msgstr "Esikatselu"
 
 #. WINDOW_VIEWER
 #. MENU_ITEM_VIEWER
 msgid "Viewer"
-msgstr "Betrachter"
+msgstr "Katselin"
 
 #. WINDOW_VIEWER_OUTPUT_FILENAME
 msgid "Viewer: select output filename"
-msgstr "Betrachter: Ausgabedatei auswählen"
+msgstr "Katselin: valitse ulostulon tiedostonimi"
 
 #. WINDOW_OCR_OUTPUT_FILENAME
 msgid "Select output filename for OCR text file"
-msgstr "Dateinamen für OCR Text auswählen"
+msgstr ""
 
 #. WINDOW_OUTPUT_FILENAME
 msgid "select output filename"
-msgstr "Ausgabedatei auswählen"
+msgstr ""
 
 #. WINDOW_SAVE_SETTINGS
 msgid "save device settings"
-msgstr "Speichere Geräteeinstellungen"
+msgstr "tallenna laitteen asetukset"
 
 #. WINDOW_LOAD_SETTINGS
 msgid "load device settings"
-msgstr "Lade Geräteeinstellungen"
+msgstr "lataa laitteen asetukset"
 
 #. WINDOW_CHANGE_WORKING_DIR
 msgid "change working directory"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr "vaihda työhakemistoa"
 
 #. WINDOW_TMP_PATH
 msgid "select temporary directory"
-msgstr "temporäres Verzeichnis auswählen"
+msgstr "valitse väliaikaishakemisto"
 
 #. WINDOW_SCALE
 #. DESC_VIEWER_SCALE
 msgid "Scale image"
-msgstr "Bild skalieren"
+msgstr "Skaalaa kuvaa"
 
 #. WINDOW_DESPECKLE
 #. DESC_VIEWER_DESPECKLE
 msgid "Despeckle image"
-msgstr "Flecken entfernen"
+msgstr "Poista laikut kuvasta"
 
 #. WINDOW_BLUR
 #. DESC_VIEWER_BLUR
 msgid "Blur image"
-msgstr "Bild weichzeichnen"
+msgstr "Sumenna kuvaa"
 
 #. WINDOW_STORE_MEDIUM
 msgid "Store medium definition"
-msgstr "Mediumdefinition speichern"
+msgstr ""
 
 #. WINDOW_NO_DEVICES
 msgid "No devices available"
-msgstr "Keine Geräte erreichbar"
+msgstr "Ei laitteita käytettävissä"
 
 #. WINDOW_SCANNER_DEFAULT_COLOR_ICM_PROFILE
 msgid "select scanner default color ICM-profile"
-msgstr "standard Farb-ICM-Profil für Scanner auswählen"
+msgstr ""
 
 #. WINDOW_SCANNER_DEFAULT_GRAY_ICM_PROFILE
 msgid "select scanner default gray ICM-profile"
-msgstr "standard Graustufen-ICM-Profil für Scanner auswählen"
+msgstr ""
 
 #. WINDOW_DISPLAY_ICM_PROFILE
 msgid "select display ICM-profile"
-msgstr "ICM-Profil für Bildschirm auswählen"
+msgstr ""
 
 #. WINDOW_CUSTOM_PROOFING_ICM_PROFILE
 msgid "select custom proofing ICM-profile"
-msgstr "Benutzerdefiniertes Proofing ICM Profil auswählen"
+msgstr ""
 
 #. WINDOW_WORKING_COLOR_SPACE_ICM_PROFILE
 msgid "select working color space ICM-profile"
-msgstr "ICM-Profil für Arbeitsfarbraum auswählen"
+msgstr ""
 
 #. WINDOW_PRINTER_ICM_PROFILE
+#, fuzzy
 msgid "select printer ICM-profile"
-msgstr "ICM Profil für Drucker auswählen"
+msgstr "Poista tulostin"
 
 #. MENU_FILE
 msgid "File"
-msgstr "Datei"
+msgstr "Tiedosto"
 
 #. MENU_PREFERENCES
 msgid "Preferences"
-msgstr "Einstellungen"
+msgstr "Asetukset"
 
 #. MENU_VIEW
 msgid "View"
-msgstr "Ansicht"
+msgstr "Näytä"
 
 #. MENU_WINDOW
 msgid "Window"
-msgstr "Fenster"
+msgstr "Ikkuna"
 
 #. MENU_HELP
 #. BUTTON_HELP
 msgid "Help"
-msgstr "Hilfe"
+msgstr "Ohje"
 
 #. MENU_EDIT
 msgid "Edit"
-msgstr "Bearbeiten"
+msgstr "Muokkaa"
 
 #. MENU_FILTERS
 msgid "Filters"
-msgstr "Filter"
+msgstr "Suotimet"
 
 #. MENU_GEOMETRY
 msgid "Geometry"
-msgstr "Geometrie"
+msgstr "Geometria"
 
 #. MENU_COLOR_MANAGEMENT
 #. NOTEBOOK_COLOR_MANAGEMENT_OPTIONS
 msgid "Color management"
-msgstr "Farbmanagement"
+msgstr ""
 
 #. MENU_ITEM_ABOUT_XSANE
 msgid "About XSane"
-msgstr "Über XSane"
+msgstr "Tietoja XSanesta"
 
 #. MENU_ITEM_INFO
 msgid "Info"
-msgstr "Informationen"
+msgstr "Tietoja"
 
 #. MENU_ITEM_QUIT
 msgid "Quit"
-msgstr "Beenden"
+msgstr "Poistu"
 
 #. MENU_ITEM_SAVE_IMAGE
 #. DESC_VIEWER_SAVE
 msgid "Save image"
-msgstr "Bild speichern"
+msgstr "Tallenna kuva"
 
 #. MENU_ITEM_OCR
 msgid "OCR - save as text"
-msgstr "OCR - als Text speichern"
+msgstr "OCR - tallenna tekstinä"
 
 #. MENU_ITEM_CLONE
 msgid "Clone"
-msgstr "Klonen"
+msgstr "Kloonaa"
 
 #. MENU_ITEM_SCALE
 msgid "Scale"
-msgstr "Skalieren"
+msgstr "Skaalaa"
 
 #. MENU_ITEM_CLOSE
 #. BUTTON_CLOSE
 msgid "Close"
-msgstr "Schließen"
+msgstr "Sulje"
 
 #. MENU_ITEM_UNDO
 msgid "Undo"
-msgstr "Rückgängig"
+msgstr "Kumoa"
 
 #. MENU_ITEM_DESPECKLE
 msgid "Despeckle"
-msgstr "Entflecken"
+msgstr "Poista laikut"
 
 #. MENU_ITEM_BLUR
 msgid "Blur"
-msgstr "Weichzeichnen"
+msgstr "Sumenna"
 
 #. MENU_ITEM_ROTATE90
 msgid "Rotate 90"
-msgstr "Drehen 90°"
+msgstr "Kierrä 90"
 
 #. MENU_ITEM_ROTATE180
 msgid "Rotate 180"
-msgstr "Drehen 180°"
+msgstr "Kierrä 180"
 
 #. MENU_ITEM_ROTATE270
 msgid "Rotate 270"
-msgstr "Drehen 270°"
+msgstr "Kierrä 270"
 
 #. MENU_ITEM_MIRROR_X
 msgid "Mirror |"
-msgstr "Spiegeln |"
+msgstr "Peilaa |"
 
 #. MENU_ITEM_MIRROR_Y
 msgid "Mirror -"
-msgstr "Spiegeln -"
+msgstr "Peilaa -"
 
 #. FRAME_RAW_IMAGE
 msgid "Raw image"
-msgstr "Rohbild"
+msgstr "Raakakuva"
 
 #. FRAME_ENHANCED_IMAGE
 msgid "Enhanced image"
-msgstr "Verbessertes Bild"
+msgstr ""
 
 #. BUTTON_SCAN
 msgid "Scan"
-msgstr "Scannen"
+msgstr "Lue kuva"
 
 #. BUTTON_OK
 msgid "Ok"
-msgstr "OK"
+msgstr "Ok"
 
 #. BUTTON_ACCEPT
 msgid "Accept"
-msgstr "Akzeptieren"
+msgstr "Hyväksy"
 
 #. BUTTON_NOT_ACCEPT
 msgid "Not accept"
-msgstr "Nicht akzeptieren"
+msgstr "Älä hyväksy"
 
 #. BUTTON_APPLY
 msgid "Apply"
-msgstr "Anwenden"
+msgstr "Toteuta"
 
 #. BUTTON_CANCEL
 msgid "Cancel"
-msgstr "Abbrechen"
+msgstr "Peru"
 
 #. BUTTON_REDUCE
 msgid "Reduce"
-msgstr "Reduzieren"
+msgstr "Supista"
 
 #. BUTTON_CONT_AT_OWN_RISK
 msgid "Continue at your own risk"
-msgstr "Auf eigenes Risiko fortfahren"
+msgstr ""
 
 #. BUTTON_BROWSE
 msgid "Browse"
-msgstr "Durchsuchen"
+msgstr "Selaa"
 
 #. BUTTON_OVERWRITE
 msgid "Overwrite"
-msgstr "Überschreiben"
+msgstr "Korvaa"
 
 #. BUTTON_BATCH_LIST_SCAN
 msgid "Scan batch list"
-msgstr "Stapelliste scannen"
+msgstr ""
 
 #. BUTTON_BATCH_AREA_SCAN
 msgid "Scan selected area"
-msgstr "Auswahl scannen"
+msgstr "Lue valittu osa kuvasta"
 
 #. BUTTON_PAGE_DELETE
 msgid "Delete page"
-msgstr "Seite löschen"
+msgstr "Poista sivu"
 
 #. BUTTON_PAGE_SHOW
 msgid "Show page"
-msgstr "Seite anzeigen"
+msgstr "Näytä sivu"
 
 #. BUTTON_PAGE_RENAME
 msgid "Rename page"
-msgstr "Seite umbenennen"
+msgstr "Muuta sivun nimeä"
 
 #. BUTTON_IMAGE_DELETE
 msgid "Delete image"
-msgstr "Bild löschen"
+msgstr "Poista kuva"
 
 #. BUTTON_IMAGE_SHOW
 msgid "Show image"
-msgstr "Bild anzeigen"
+msgstr "Näytä kuva"
 
 #. BUTTON_IMAGE_EDIT
 msgid "Edit image"
-msgstr "Bild ändern"
+msgstr "Muokkaa kuvaa"
 
 #. BUTTON_IMAGE_RENAME
 msgid "Rename image"
-msgstr "Bild umbenennen"
+msgstr "Muuta kuvan nimeä"
 
 #. BUTTON_FILE_INSERT
 msgid "Insert file"
-msgstr "Datei einfügen"
+msgstr "Lisää tiedosto"
 
 #. BUTTON_CREATE_PROJECT
 msgid "Create project"
-msgstr "Projekt erstellen"
+msgstr "Luo projekti"
 
 #. BUTTON_SEND_PROJECT
 msgid "Send project"
-msgstr "Projekt senden"
+msgstr "Lähetä projekti"
 
 #. BUTTON_SAVE_MULTIPAGE
 msgid "Save multipage file"
-msgstr "Mehrseitige Datei speichern"
+msgstr ""
 
 #. BUTTON_DELETE_PROJECT
 msgid "Delete project"
-msgstr "Projekt löschen"
+msgstr "Poista projekti"
 
 #. BUTTON_ADD_PRINTER
 msgid "Add printer"
-msgstr "Drucker hinzufügen"
+msgstr "Lisää tulostin"
 
 #. BUTTON_DELETE_PRINTER
 msgid "Delete printer"
-msgstr "Drucker löschen"
+msgstr "Poista tulostin"
 
 #. BUTTON_PREVIEW_ACQUIRE
 msgid "Acquire preview"
-msgstr "Vorschauscan"
+msgstr "Lue esikatselukuva"
 
 #. BUTTON_PREVIEW_CANCEL
 msgid "Cancel preview"
-msgstr "Vorschauscan abbrechen"
+msgstr "Peru esikatselu"
 
 #. BUTTON_DISCARD_IMAGE
 msgid "Discard image"
-msgstr "Bild verwerfen"
+msgstr "Hylkää kuva"
 
 #. BUTTON_DISCARD_ALL_IMAGES
 msgid "Discard all images"
-msgstr "alle Bilder verwerfen"
+msgstr "Hylkää kaikki kuvat"
 
 #. BUTTON_DO_NOT_CLOSE
 msgid "Do not close"
-msgstr "nicht schließen"
+msgstr "Älä sulje"
 
 #. BUTTON_SCALE_BIND
 msgid "Bind scale"
-msgstr "Verbinde Skalierung"
+msgstr "Sido skaalaus"
 
 #. RADIO_BUTTON_FINE_MODE
 msgid "Fine mode"
-msgstr "Fein-Modus"
+msgstr ""
 
 #. RADIO_BUTTON_HTML_EMAIL
 msgid "HTML e-mail"
-msgstr "HTML E-Mail"
+msgstr ""
 
 #. RADIO_BUTTON_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device preferences at exit"
-msgstr "Geräteeinstellungen beim Verlassen speichern"
+msgstr "Tallenna laiteasetukset poistuttaessa"
 
 #. RADIO_BUTTON_OVERWRITE_WARNING
 msgid "Overwrite warning"
-msgstr "Überschreibwarnung"
+msgstr "Korvausvaroitus"
 
 #. RADIO_BUTTON_SKIP_EXISTING_NRS
 msgid "Skip existing filenames"
-msgstr "Existierende Dateinamen überspringen"
+msgstr "Ohita olemassaolevat tiedostonimet"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
-msgstr "Speichere Postscript zlib-komprimiert (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
+msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
 msgid "Save PDF zlib compressed"
-msgstr "Speichere PDF zlib-komprimiert"
+msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
-msgstr "Speichere 16bit pnm im ASCII-Format"
+msgid "Save 16bit PNM in ASCII format"
+msgstr ""
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
 msgid "Reduce 16 bit image to 8 bit"
-msgstr "Reduziere 16 Bit Bild auf 8 Bit"
+msgstr ""
 
 #. RADIO_BUTTON_WINDOW_FIXED
 msgid "Main window size fixed"
-msgstr "Feste Hauptfenstergröße"
+msgstr "Kiinteä pääikkunan koko"
 
 #. RADIO_BUTTON_DISABLE_GIMP_PREVIEW_GAMMA
+#, fuzzy
 msgid "Disable GIMP preview gamma"
-msgstr "Vorschau-Gamma für GIMP deaktivieren"
+msgstr "Ota gimp-esikatselugamma pois käytöstä"
 
 #. RADIO_BUTTON_PRIVATE_COLORMAP
 msgid "Use private colormap"
-msgstr "Benutze eigene Farbpalette"
+msgstr ""
 
 #. RADIO_BUTTON_AUTOENHANCE_GAMMA
 msgid "Autoenhance gamma"
-msgstr "Automatische Gammakorrektur"
+msgstr "Paranna gamma-arvoa automaattisesti"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
-msgstr "Scanbereich automatisch wählen"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
+msgstr "Esivalitse kuvanlukualue"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
 msgid "Autocorrect colors"
-msgstr "Automatische Farbkorrektur"
+msgstr "Korjaa värit automaattisesti"
 
 #. RADIO_BUTTON_OCR_USE_GUI_PIPE
 msgid "Use GUI progress pipe"
-msgstr "Benutze GUI Fortschritts Pipe"
+msgstr ""
 
 #. RADIO_BUTTON_CMS_BPC
 #. MENU_ITEM_CMS_BLACK_POINT_COMPENSATION
 msgid "Black point compensation"
-msgstr "Schwarzpunkt kompensieren"
+msgstr ""
 
 #. TEXT_SCANNING_DEVICES
 msgid "scanning for devices"
-msgstr "Suche nach Geräten"
+msgstr "etsitään laitteita"
 
 #. TEXT_AVAILABLE_DEVICES
 msgid "Available devices:"
-msgstr "Erreichbare Geräte:"
-
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "XSane Optionen"
+msgstr "Löydetyt laitteet:"
 
 #. TEXT_FILETYPE
 msgid "Type"
-msgstr "Typ"
+msgstr "Tyyppi"
 
 #. TEXT_CMS_FUNCTION
 #. DESC_CMS_FUNCTION
 msgid "Color management function"
-msgstr "Farbmanagement-Funktion"
+msgstr ""
 
 #. TEXT_SCANNER_BACKEND
 msgid "Scanner and backend:"
-msgstr "Scanner und Backends"
+msgstr "Kuvanlukija ja taustaohjelma:"
 
 #. TEXT_VENDOR
 msgid "Vendor:"
-msgstr "Hersteller:"
+msgstr "Valmistaja:"
 
 #. TEXT_MODEL
 msgid "Model:"
-msgstr "Modell:"
+msgstr "Malli:"
 
 #. TEXT_TYPE
 msgid "Type:"
-msgstr "Typ:"
+msgstr "Tyyppi:"
 
 #. TEXT_DEVICE
 msgid "Device:"
-msgstr "Gerät:"
+msgstr "Laite:"
 
 #. TEXT_LOADED_BACKEND
 msgid "Loaded backend:"
-msgstr "Geladenes Backend:"
+msgstr "Ladattu taustaohjelma:"
 
 #. TEXT_SANE_VERSION
 msgid "Sane version:"
-msgstr "sane Version:"
+msgstr "Sane-versio:"
 
 #. TEXT_RECENT_VALUES
 msgid "Recent values:"
-msgstr "Aktuelle Werte:"
+msgstr "Viimeaikaiset arvot:"
 
 #. TEXT_GAMMA_CORR_BY
 msgid "Gamma correction by:"
-msgstr "Gammakorrektur durch:"
+msgstr "Gamma-korjaus:"
 
 #. TEXT_SCANNER
 msgid "scanner"
-msgstr "Scanner"
+msgstr "kuvanlukija"
 
 #. TEXT_SOFTWARE_XSANE
 msgid "software (XSane)"
-msgstr "Software (XSane)"
+msgstr "ohjelma (XSane)"
 
 #. TEXT_NONE
 msgid "none"
-msgstr "keine"
+msgstr "ei mitään"
 
 #. TEXT_GAMMA_INPUT_DEPTH
 msgid "Gamma input depth:"
-msgstr "Bittiefe Gammaeingabe:"
+msgstr ""
 
 #. TEXT_GAMMA_OUTPUT_DEPTH
 msgid "Gamma output depth:"
-msgstr "Bittiefe Gammaausgabe:"
+msgstr ""
 
 #. TEXT_SCANNER_OUTPUT_DEPTH
 msgid "Scanner output depth:"
-msgstr "Bittiefe Scannerausgabe:"
+msgstr ""
 
 #. TEXT_OUTPUT_FORMATS
 msgid "XSane output formats:"
-msgstr "XSane Ausgabeformate:"
+msgstr ""
 
 #. TEXT_8BIT_FORMATS
 msgid "8 bit output formats:"
-msgstr "8 Bit Ausgabeformate:"
+msgstr ""
 
 #. TEXT_16BIT_FORMATS
 msgid "16 bit output formats:"
-msgstr "16 Bit Ausgabeformate:"
+msgstr ""
 
 #. TEXT_REDUCE_16BIT_TO_8BIT
 msgid ""
 "Bit depth 16 bits/channel is not supported for this output format.\n"
 "Do you want to reduce the depth to 8 bits/channel?"
 msgstr ""
-"Die Bittiefe 16Bits/Kanal wird von diesem Ausgabeformat nicht unterstützt.\n"
-"Möchten Sie die Bittiefe auf 8 Bits/Kanal reduzieren?"
 
 #. TEXT_AUTHORIZATION_REQ
 msgid "Authorization required for"
-msgstr "Autorisation benötigt für"
+msgstr ""
 
 #. TEXT_AUTHORIZATION_SECURE
 msgid "Password transmission is secure"
-msgstr "Passwortübertragung ist sicher"
+msgstr ""
 
 #. TEXT_AUTHORIZATION_INSECURE
 msgid "Backend requests plain-text password"
-msgstr "Backend erbittet unverschlüsseltes Passwort"
+msgstr ""
 
 #. TEXT_USERNAME
 msgid "Username :"
-msgstr "Benutzername:"
+msgstr ""
 
 #. TEXT_PASSWORD
 msgid "Password :"
-msgstr "Passwort:"
+msgstr ""
 
 #. TEXT_INVALID_PARAMS
 msgid "Invalid parameters."
-msgstr "Ungültige Parameter"
+msgstr ""
 
 #. TEXT_VERSION
 msgid "version:"
-msgstr "Version:"
+msgstr ""
 
 #. TEXT_PACKAGE
 msgid "package"
-msgstr "Paket"
+msgstr ""
 
 #. TEXT_WITH_CMS_FUNCTION
 msgid "with color management function"
-msgstr "mit Farbmanagement-Funktion"
+msgstr ""
 
 #. TEXT_WITH_GIMP_SUPPORT
 msgid "with GIMP support"
-msgstr "mit GIMP-Unterstützung"
+msgstr ""
 
 #. TEXT_WITHOUT_GIMP_SUPPORT
 msgid "without GIMP support"
-msgstr "ohne GIMP-Unterstützung"
+msgstr ""
 
 #. TEXT_GTK_VERSION
 msgid "compiled with GTK-"
-msgstr "übersetzt mit GTK-"
+msgstr ""
 
 #. TEXT_GIMP_VERSION
 msgid "compiled with GIMP-"
-msgstr "übersetzt mit GIMP-"
+msgstr ""
 
 #. TEXT_UNKNOWN
 msgid "unknown"
-msgstr "unbekannt"
+msgstr ""
 
 #. TEXT_EULA
 msgid ""
@@ -713,18 +716,6 @@ msgid ""
 "have to read, understand and accept the following\n"
 "\"NO WARRANTY\" agreement.\n"
 msgstr ""
-"XSane wird unter den Bedingungen der GNU General Public Licence, wie\n"
-"von der Free Software Foundation veröffentlicht, herausgegeben, entweder\n"
-"Version 2 der Lizenz, oder (wenn Sie wünschen) jeder späteren Version.\n"
-"\n"
-"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es\n"
-"Ihnen von Nutzen sein wird, aber OHNE JEDE GEWÄHRLEISTUNG\n"
-"- sogar ohne die implizite Gewährleistung der MARKTREIFE oder der\n"
-"EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. Sollte das Programm einen\n"
-"Schaden verursachen, dann tragen Sie - der Benutzer - die Kosten\n"
-"für alle notwendigen Dienstleistungen, Reparaturen oder Korrekturen.\n"
-"Um dieses Programm zu benutzen, haben Sie die folgende Vereinbarung\n"
-"über den Haftungsausschluß zu lesen, zu verstehen und zu akzeptieren.\n"
 
 #. TEXT_GPL
 msgid ""
@@ -736,30 +727,22 @@ msgid ""
 "WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
-"XSane wird unter den Bedingungen der GNU General Public Licence, wie\n"
-"von der Free Software Foundation veröffentlicht, herausgegeben, entweder\n"
-"Version 2 der Lizenz, oder (wenn Sie wünschen) jeder späteren Version.\n"
-"\n"
-"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es\n"
-"Ihnen von Nutzen sein wird, aber OHNE JEDE GEWÄHRLEISTUNG\n"
-"- sogar ohne die implizite Gewährleistung der MARKTREIFE oder der\n"
-"EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.\n"
 
 #. TEXT_EMAIL_ADR
 msgid "E-mail:"
-msgstr "E-Mail:"
+msgstr ""
 
 #. TEXT_HOMEPAGE
 msgid "Homepage:"
-msgstr "Homepage:"
+msgstr "Kotisivu:"
 
 #. TEXT_FILE
 msgid "File:"
-msgstr "Datei:"
+msgstr "Tiedosto:"
 
 #. TEXT_TRANSLATION
 msgid "Translation:"
-msgstr "Übersetzung:"
+msgstr "Käännös:"
 
 #. Please translate this to something like
 #. translation to YOUR LANGUAGE\n
@@ -771,9 +754,6 @@ msgid ""
 "by Oliver Rauch\n"
 "E-mail: Oliver.Rauch@rauch-domain.de\n"
 msgstr ""
-"Übersetzung ins Deutsche\n"
-"von Oliver Rauch\n"
-"E-Mail: Oliver.Rauch@rauch-domain.de\n"
 
 #. TEXT_INFO_BOX
 msgid "0x0: 0KB"
@@ -781,572 +761,603 @@ msgstr "0x0: 0KB"
 
 #. TEXT_ADF_PAGES_SCANNED
 msgid "Scanned pages: "
-msgstr "gescannte Seiten: "
+msgstr "Luetut sivut: "
 
 #. TEXT_EMAIL_TEXT
 msgid "E-mail text:"
-msgstr "E-Mail Text:"
+msgstr ""
 
 #. TEXT_ATTACHMENTS
 msgid "Attachments:"
-msgstr "Anhang:"
+msgstr "Liitteet:"
 
 #. TEXT_EMAIL_STATUS
 msgid "Project status:"
-msgstr "Projekt Status:"
+msgstr "Projektin tila:"
 
 #. TEXT_EMAIL_FILETYPE
 msgid "E-mail image filetype:"
-msgstr "Dateityp für E-Mail:"
+msgstr ""
 
 #. TEXT_PAGES
 msgid "Pages:"
-msgstr "Seiten:"
+msgstr ""
 
 #. TEXT_MULTIPAGE_FILETYPE
 msgid "Multipage document filetype:"
-msgstr "Dateityp mehrseitiges Dokument:"
+msgstr ""
 
 #. TEXT_MEDIUM_DEFINITION_NAME
 msgid "Medium Name:"
-msgstr "Medium Name:"
+msgstr ""
 
 #. TEXT_VIEWER_IMAGE_INFO
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Size %d x %d pixel, %d bits/channel, %d channels, %1.0f dpi x %1.0f dpi, %"
 "1.1f %s"
 msgstr ""
-"Größe %d x %d Punkte, %d Bit/Kanal, %d Kanäle, %1.0f dpi x %1.0f dpi, %1.1f %"
-"s"
+"Koko %d x %d pikseliä, %d bittiä/väri, %d väriä, %1.0f dpi x %1.0f dpi, %"
+"1.1f %s"
 
 #. TEXT_DESPECKLE_RADIUS
 msgid "Despeckle radius:"
-msgstr "Entflecken Radius:"
+msgstr "Laikkujen poiston säde:"
 
 #. TEXT_BLUR_RADIUS
 msgid "Blur radius:"
-msgstr "Weichzeichnen Radius:"
+msgstr "Sumennuksen säde:"
 
 #. TEXT_BATCH_AREA_DEFAULT_NAME
 msgid "(no name)"
-msgstr "(kein Name)"
+msgstr "(nimetön)"
 
 #. TEXT_BATCH_LIST_AREANAME
 msgid "Area name:"
-msgstr "Bereichsname:"
+msgstr ""
 
 #. TEXT_BATCH_LIST_SCANMODE
 msgid "Scanmode:"
-msgstr "Scanmodus:"
+msgstr "Kuvanlukutapa:"
 
 #. TEXT_BATCH_LIST_GEOMETRY_TL
 msgid "Top left:"
-msgstr "Oben links:"
+msgstr "Vasen yläreuna:"
 
 #. TEXT_BATCH_LIST_GEOMETRY_SIZE
 msgid "Size:"
-msgstr "Größe:"
+msgstr "Koko:"
 
 #. TEXT_BATCH_LIST_RESOLUTION
 msgid "Resolution:"
-msgstr "Auflösung:"
+msgstr "Tarkkuus:"
 
 #. TEXT_BATCH_LIST_BIT_DEPTH
 msgid "Bit depth:"
-msgstr "Bittiefe:"
+msgstr "Värisyvyys:"
 
 #. TEXT_BATCH_LIST_BY_GUI
 msgid "as selected"
-msgstr "wie ausgewählt"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_SEL
 msgid "Printer selection:"
-msgstr "Druckerauswahl:"
+msgstr "Tulostimen valinta:"
 
 #. TEXT_SETUP_PRINTER_NAME
 msgid "Name:"
-msgstr "Name:"
+msgstr "Nimi:"
 
 #. TEXT_SETUP_PRINTER_CMD, TEXT_SETUP_FAX_CMD
 #. TEXT_SETUP_FAX_COMMAND
 msgid "Command:"
-msgstr "Befehl:"
+msgstr "Komento:"
 
 #. TEXT_SETUP_COPY_NR_OPT
 msgid "Copy number option:"
-msgstr "Option for Anzahl der Kopien:"
+msgstr ""
+
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Aseta kuvanluvun tarkkuus"
 
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
-msgstr "Lineart Auflösung (dpi):"
+msgid "lineart [dpi]"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
-msgstr "Graustufen Auflösung (dpi):"
+msgid "grayscale [dpi]"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Farb-Auflösung (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
-msgstr "Breite"
+#, fuzzy
+msgid "width"
+msgstr "Leveys"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
-msgstr "Höhe"
+#, fuzzy
+msgid "height"
+msgstr "Korkeus"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
-msgstr "Linker Rand"
+msgid "left offset"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
-msgstr "Unterer Rand"
+msgid "bottom offset"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Tulostimen punagamma:"
 
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Drucker Gammawert:"
+#, fuzzy
+msgid "common value"
+msgstr "Viimeaikaiset arvot:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Drucker Gammawert rot:"
+#, fuzzy
+msgid "red"
+msgstr "luku"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Drucker Gammawert grün:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Drucker Gammawert blau:"
+msgid "blue"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 msgid "Embed scanner ICM profile as CSA"
-msgstr "Scanner/Quell-ICM-Profil als CSA einbinden"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_EMBED_CRD
 msgid "Embed printer ICM profile as CRD"
-msgstr "ICM Profil für Drucker als CRD einbinden"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_CMS_BPC
-#, fuzzy
 msgid "Apply black point compensation"
-msgstr "Schwarzpunkt kompensieren"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
-msgstr "Erzeuge zlib-komprimiertes Posctscript Bild (ps level 3) zum Drucken"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
+msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
 msgid "Temporary directory"
-msgstr "Temporäres Verzeichnis"
+msgstr "Väliaikaishakemisto"
 
 #. TEXT_SETUP_IMAGE_PERMISSION
 msgid "Image-file permissions"
-msgstr "Bilddatei-Rechte"
+msgstr "Kuvatiedoston oikeudet"
 
 #. TEXT_SETUP_DIR_PERMISSION
 msgid "Directory permissions"
-msgstr "Verzeichnisrechte"
+msgstr "Hakemiston oikeudet"
 
 #. TEXT_SETUP_JPEG_QUALITY
 msgid "JPEG image quality"
-msgstr "JPEG Bildqualität"
+msgstr "JPEG-kuvanlaatu"
 
 #. TEXT_SETUP_PNG_COMPRESSION
 msgid "PNG image compression"
-msgstr "PNG Bildkompression"
+msgstr "PNG-kuvan pakkaus"
 
 #. TEXT_SETUP_FILENAME_COUNTER_LEN
 msgid "Filename counter length"
-msgstr "Dateinamenzähler Länge"
+msgstr "Tiedostonimen laskurin pituus"
 
 #. TEXT_SETUP_TIFF_ZIP_COMPRESSION
 msgid "TIFF zip compression rate"
-msgstr "TIFF zip Kompressionsrate"
+msgstr ""
 
 #. TEXT_SETUP_TIFF_COMPRESSION_16
 msgid "TIFF 16 bit image compression"
-msgstr "TIFF 16 bit Bildkompression"
+msgstr ""
 
 #. TEXT_SETUP_TIFF_COMPRESSION_8
 msgid "TIFF 8 bit image compression"
-msgstr "TIFF 8 bit Bildkompression"
+msgstr ""
 
 #. TEXT_SETUP_TIFF_COMPRESSION_1
 msgid "TIFF lineart image compression"
-msgstr "TIFF lineart Bildkompression"
+msgstr ""
 
 #. TEXT_SETUP_SHOW_RANGE_MODE
 msgid "Show range as:"
-msgstr "Zeige Bereich als:"
+msgstr ""
 
 #. TEXT_SETUP_PREVIEW_OVERSAMPLING
 msgid "Preview oversampling:"
-msgstr "Vorschau Oversampling:"
+msgstr ""
 
 #. TEXT_SETUP_PREVIEW_GAMMA
 msgid "Preview gamma:"
-msgstr "Vorschau Gamma:"
+msgstr ""
 
 #. TEXT_SETUP_PREVIEW_GAMMA_RED
 msgid "Preview gamma red:"
-msgstr "Vorschau Gamma rot:"
+msgstr ""
 
 #. TEXT_SETUP_PREVIEW_GAMMA_GREEN
 msgid "Preview gamma green:"
-msgstr "Vorschau Gamma grün:"
+msgstr ""
 
 #. TEXT_SETUP_PREVIEW_GAMMA_BLUE
 msgid "Preview gamma blue:"
-msgstr "Vorschau Gamma blau:"
+msgstr ""
 
 #. TEXT_SETUP_LINEART_MODE
 msgid "Threshold option:"
-msgstr "Schwellwert Option:"
+msgstr ""
 
 #. TEXT_SETUP_PREVIEW_PIPETTE_RANGE
 msgid "Preview pipette range"
-msgstr "Vorschau Bereich Pipette"
+msgstr ""
 
 #. TEXT_SETUP_THRESHOLD_MIN
 msgid "Threshold minimum:"
-msgstr "Schwellwert Minimum:"
+msgstr ""
 
 #. TEXT_SETUP_THRESHOLD_MAX
 msgid "Threshold maximum:"
-msgstr "Schwellwert Maximum:"
+msgstr ""
 
 #. TEXT_SETUP_THRESHOLD_MUL
 msgid "Threshold multiplier:"
-msgstr "Schwellwert Multiplikator:"
+msgstr ""
 
 #. TEXT_SETUP_THRESHOLD_OFF
 msgid "Threshold offset:"
-msgstr "Schwellwert Verschiebung:"
+msgstr ""
 
 #. TEXT_SETUP_GRAYSCALE_SCANMODE
 msgid "Name of grayscale scanmode:"
-msgstr "Name des Scanodus \"Graustufen\":"
+msgstr ""
 
 #. TEXT_SETUP_HELPFILE_VIEWER
 msgid "Helpfile viewer (HTML):"
-msgstr "Hilfedatei Betrachter (HTML):"
+msgstr "Ohjekatselin (HTML):"
 
 #. TEXT_SETUP_FAX_RECEIVER_OPTION
 msgid "Receiver option:"
-msgstr "Option für Empfängernummer"
+msgstr "Vastaanottajavalitsin:"
 
 #. TEXT_SETUP_FAX_POSTSCRIPT_OPT
 msgid "Postscriptfile option:"
-msgstr "Option für Postscriptdatei:"
+msgstr "Postscript-tiedostovalitsin:"
 
 #. TEXT_SETUP_FAX_NORMAL_MODE_OPT
 msgid "Normal mode option:"
-msgstr "Option für Normalmodus:"
+msgstr ""
 
 #. TEXT_SETUP_FAX_FINE_MODE_OPT
 msgid "Fine mode option:"
-msgstr "Option für Feinmodus:"
+msgstr ""
 
 #. TEXT_SETUP_FAX_PROGRAM_DEFAULTS
 msgid "Set program defaults for:"
-msgstr "Setze Standardwerte für folgendes Programm"
+msgstr ""
 
 #. TEXT_SETUP_FAX_VIEWER
 msgid "Viewer (Postscript):"
-msgstr "Betrachter (Postscript):"
+msgstr "Katselin (Postscript):"
+
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Leveys"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Korkeus"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr ""
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr ""
 
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
-msgstr "Erzeuge zlib-komprimiertes Postscript-Bild (ps level 3) zum Faxen"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
+msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
 msgid "SMTP server:"
-msgstr "SMTP Server:"
+msgstr "SMTP-palvelin"
 
 #. TEXT_SETUP_SMTP_PORT
 msgid "SMTP port:"
-msgstr "SMTP Port:"
+msgstr "SMTP-portti"
 
 #. TEXT_SETUP_EMAIL_FROM
 msgid "From:"
-msgstr "Von:"
+msgstr "Lähettäjä:"
 
 #. TEXT_SETUP_EMAIL_REPLY_TO
 msgid "Reply to:"
-msgstr "Antwort an:"
+msgstr "Vastausosoite:"
 
 #. TEXT_SETUP_EMAIL_AUTHENTICATION
 msgid "E-mail authentication"
-msgstr "E-Mail Authentifizierung"
+msgstr ""
 
 #. TEXT_SETUP_EMAIL_AUTH_USER
 msgid "User:"
-msgstr "Benutzer:"
+msgstr ""
 
 #. TEXT_SETUP_EMAIL_AUTH_PASS
 msgid "Password:"
-msgstr "Passwort:"
+msgstr ""
 
 #. TEXT_SETUP_POP3_SERVER
 msgid "POP3 server:"
-msgstr "POP3-Server:"
+msgstr "POP3-palvelin:"
 
 #. TEXT_SETUP_POP3_PORT
 msgid "POP3 port:"
-msgstr "POP3-Port:"
+msgstr "POP3-portti:"
 
 #. TEXT_SETUP_OCR_COMMAND
 msgid "OCR Command:"
-msgstr "OCR Befehl:"
+msgstr "OCR-komento:"
 
 #. TEXT_SETUP_OCR_INPUTFILE_OPT
 msgid "Inputfile option:"
-msgstr "Option für Eingabedatei:"
+msgstr "Syötetiedostovalitsin:"
 
 #. TEXT_SETUP_OCR_OUTPUTFILE_OPT
 msgid "Outputfile option:"
-msgstr "Option für Ausgabedatei:"
+msgstr "Tulostetiedostovalitsin:"
 
 #. TEXT_SETUP_OCR_USE_GUI_PIPE_OPT
 msgid "Use GUI progress pipe:"
-msgstr "Benutze GUI Fortschritts-Pipe"
+msgstr ""
 
 #. TEXT_SETUP_OCR_OUTFD_OPT
 msgid "GUI output-fd option:"
-msgstr "GUI Ausgabe-fd Option:"
+msgstr ""
 
 #. TEXT_SETUP_OCR_PROGRESS_KEYWORD
 msgid "Progress keyword:"
-msgstr "Fortschritts-Schluesselwort:"
+msgstr ""
 
 #. TEXT_SETUP_PERMISSION_USER
 msgid "user"
-msgstr "Benutzer"
+msgstr "käyttäjä"
 
 #. TEXT_SETUP_PERMISSION_GROUP
 msgid "group"
-msgstr "Gruppe"
+msgstr "ryhmä"
 
 #. TEXT_SETUP_PERMISSION_ALL
 msgid "all"
-msgstr "Alle"
+msgstr "kaikki"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_COLOR_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_COLOR_ICM_PROFILE
 msgid "Scanner default color ICM-profile"
-msgstr "Standard Scanner Farb-ICM-Profil"
+msgstr ""
 
 #. TEXT_SETUP_SCANNER_DEFAULT_GRAY_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_GRAY_ICM_PROFILE
 msgid "Scanner default gray ICM-profile"
-msgstr "Standard Scanner Graustufen ICM-Profil"
+msgstr ""
 
 #. TEXT_SETUP_DISPLAY_ICM_PROFILE
 #. DESC_DISPLAY_ICM_PROFILE
 msgid "Display ICM-profile"
-msgstr "Bildschirm ICM-Profil"
+msgstr ""
 
 #. TEXT_SETUP_CUSTOM_PROOFING_ICM_PROFILE
 #. DESC_CUSTOM_PROOFING_ICM_PROFILE
 msgid "Custom proofing ICM-profile"
-msgstr "Benutzerdefiniertes Proofing ICM-Profil"
+msgstr ""
 
 #. TEXT_SETUP_WORKING_COLOR_SPACE_ICM_PROFILE
 #. DESC_WORKING_COLOR_SPACE_ICM_PROFILE
 msgid "Working color space ICM-profile"
-msgstr "Arbeitsfarbraum ICM-Profil"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_ICM_PROFILE
 #. DESC_PRINTER_ICM_PROFILE
 msgid "Printer ICM-profile"
-msgstr "Drucker ICM-Profil"
+msgstr ""
 
 msgid "new media"
-msgstr "neues Medium"
+msgstr ""
 
 #. NOTEBOOK_SAVING_OPTIONS
 #. MENU_ITEM_SAVE
 msgid "Save"
-msgstr "Speichern"
+msgstr "Tallenna"
 
 #. NOTEBOOK_FILETYPE_OPTIONS
 msgid "Filetype"
-msgstr "Dateityp"
+msgstr ""
 
 #. NOTEBOOK_COPY_OPTIONS
 #. MENU_ITEM_COPY
 msgid "Copy"
-msgstr "Fotokopie"
+msgstr "Kopioi"
 
 #. NOTEBOOK_FAX_OPTIONS
 #. MENU_ITEM_FAX
 msgid "Fax"
-msgstr "Fax"
+msgstr "Faksi"
 
 #. NOTEBOOK_EMAIL_OPTIONS
 #. MENU_ITEM_EMAIL
 msgid "E-mail"
-msgstr "E-Mail"
+msgstr ""
 
 #. NOTEBOOK_OCR_OPTIONS
 msgid "OCR"
-msgstr "Texterkennung"
+msgstr "OCR"
 
 #. NOTEBOOK_DISPLAY_OPTIONS
 msgid "Display"
-msgstr "Darstellung"
+msgstr "Näyttö"
 
 #. NOTEBOOK_ENHANCE_OPTIONS
 msgid "Enhancement"
-msgstr "Verbesserungen"
+msgstr "Parannus"
 
 #. MENU_ITEM_MULTIPAGE
 msgid "Multipage"
-msgstr "Mehrseitig"
+msgstr ""
 
 #. MENU_ITEM_SHOW_TOOLTIPS
 msgid "Show tooltips"
-msgstr "Zeige Tipps"
+msgstr "Näytä työkaluvihjeet"
 
 #. MENU_ITEM_SHOW_PREVIEW
 msgid "Show preview"
-msgstr "Zeige Vorschau"
+msgstr "Näytä esikatselu"
 
 #. MENU_ITEM_SHOW_HISTOGRAM
 msgid "Show histogram"
-msgstr "Zeige Histogramm"
+msgstr "Näytä histogrammi"
 
 #. MENU_ITEM_SHOW_GAMMA
 msgid "Show gamma curve"
-msgstr "Zeige Gammakurve"
+msgstr "Näytä gammakäyrä"
 
 #. MENU_ITEM_SHOW_BATCH_SCAN
 msgid "Show batch scan"
-msgstr "Zeige Stapelliste"
+msgstr ""
 
 #. MENU_ITEM_SHOW_STANDARDOPTIONS
 msgid "Show standard options"
-msgstr "Zeige Standardoptionen"
+msgstr "Näytä perusasetukset"
 
 #. MENU_ITEM_SHOW_ADVANCEDOPTIONS
 msgid "Show advanced options"
-msgstr "Zeige erweiterte Optionen"
+msgstr "Näytä lisäasetukset"
 
 #. MENU_ITEM_SETUP
 msgid "Setup"
-msgstr "Konfiguration"
+msgstr "Asetukset"
 
 #. MENU_ITEM_LENGTH_UNIT
 msgid "Length unit"
-msgstr "Längeneinheit"
+msgstr "Pituusyksikkö"
 
 #. SUBMENU_ITEM_LENGTH_MILLIMETERS
 msgid "millimeters"
-msgstr "Millimeter"
+msgstr "millimetrit"
 
 #. SUBMENU_ITEM_LENGTH_CENTIMETERS
 msgid "centimeters"
-msgstr "Zentimeter"
+msgstr "senttimetrit"
 
 #. SUBMENU_ITEM_LENGTH_INCHES
 msgid "inches"
-msgstr "Zoll"
+msgstr "tuumat"
 
 #. MENU_ITEM_UPDATE_POLICY
 msgid "Update policy"
-msgstr "Aktualisierung"
+msgstr "Päivityskäytäntö"
 
 #. SUBMENU_ITEM_POLICY_CONTINUOUS
 msgid "continuous"
-msgstr "kontinuierlich"
+msgstr "jatkuva"
 
 #. SUBMENU_ITEM_POLICY_DISCONTINU
 msgid "discontinuous"
-msgstr "diskontinuierlich"
+msgstr "epäjatkuva"
 
 #. SUBMENU_ITEM_POLICY_DELAYED
 msgid "delayed"
-msgstr "verzögert"
+msgstr "viivästetty"
 
 #. MENU_ITEM_SHOW_RESOLUTIONLIST
 msgid "Show resolution list"
-msgstr "Zeige Auflösungsliste"
+msgstr "Näytä tarkkuusluettelo"
 
 #. MENU_ITEM_PAGE_ROTATE
 msgid "Rotate postscript"
-msgstr "Drehe Postscript"
+msgstr "Kierrä postscript"
 
 #. MENU_ITEM_ENABLE_COLOR_MANAGEMENT
 #. MENU_ITEM_CMS_ENABLE_COLOR_MANAGEMENT
+#, fuzzy
 msgid "Enable color management"
-msgstr "aktiviere Farbmanagement"
+msgstr "Täysi värivalikoima"
 
 #. MENU_ITEM_EDIT_MEDIUM_DEF
 msgid "Edit medium definition"
-msgstr "Mediumdefinition ändern"
+msgstr ""
 
 #. MENU_ITEM_SAVE_DEVICE_SETTINGS
 msgid "Save device settings"
-msgstr "Speichere Geräteeinstellungen"
+msgstr "Tallenna laiteasetukset"
 
 #. MENU_ITEM_LOAD_DEVICE_SETTINGS
 msgid "Load device settings"
-msgstr "Lade Geräteeinstellungen"
+msgstr "Lataa laiteasetukest"
 
 #. MENU_ITEM_CHANGE_WORKING_DIR
 msgid "Change directory"
-msgstr "Arbeitsverzeichnis ändern"
+msgstr "Vaihda hakemistoa"
 
 #. MENU_ITEM_XSANE_EULA
 msgid "Show EULA"
-msgstr "Zeige Endbenutzervereinbarung"
+msgstr "Näytä EULA"
 
 #. MENU_ITEM_XSANE_GPL
 msgid "Show license (GPL)"
-msgstr "Zeige Lizenz (GPL)"
+msgstr "Näytä lisenssi (GPL)"
 
 #. MENU_ITEM_XSANE_DOC
 msgid "XSane doc"
-msgstr "XSane Anleitung"
+msgstr "XSane-dokumentaatio"
 
 #. MENU_ITEM_BACKEND_DOC
 msgid "Backend doc"
-msgstr "Backend Anleitung"
+msgstr "Taustaosan dokumentaatio"
 
 #. MENU_ITEM_AVAILABLE_BACKENDS
 msgid "Available backends"
-msgstr "Erreichbare Backends"
+msgstr "Käytettävissä olevat taustaosat"
 
 #. MENU_ITEM_SCANTIPS
 msgid "Scantips"
-msgstr "Scantipps"
+msgstr "Kuvanlukuvinkkejä"
 
 #. MENU_ITEM_PROBLEMS
 msgid "Problems?"
-msgstr "Probleme?"
+msgstr "Ongelmia?"
 
 #. MENU_ITEM_CMS_PROOFING
 msgid "Proofing"
-msgstr "Proofing"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_PROOF_OFF
 msgid "no proofing (Display)"
-msgstr "keine Nachbildung (Bildschirm)"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_PROOF_PRINTER
+#, fuzzy
 msgid "Proof printer"
-msgstr "Nachbildung Drucker"
+msgstr "Lisää tulostin"
 
 #. SUBMENU_ITEM_CMS_PROOF_CUSTOM
 msgid "Proof custom device"
-msgstr "Nachbildung Benutzerdefinierte Ausgabe"
+msgstr ""
 
 #. MENU_ITEM_CMS_RENDERING_INTENT
 msgid "Rendering intent"
@@ -1358,454 +1369,457 @@ msgstr ""
 
 #. SUBMENU_ITEM_CMS_INTENT_PERCEPTUAL
 msgid "Perceptual"
-msgstr "Wahrnehmungsorientiert"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_INTENT_RELATIVE_COLORIMETRIC
 msgid "Relative colorimetric"
-msgstr "Relativ farbmetrisch"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_INTENT_ABSOLUTE_COLORIMETRIC
 msgid "Absolute colorimentric"
-msgstr "Absolut farbmetrisch"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_INTENT_SATURATION
 msgid "Saturation"
-msgstr "Sättigung"
+msgstr ""
 
 #. MENU_ITEM_CMS_GAMUT_CHECK
 msgid "Gamut check"
-msgstr "Gamut prüfen"
+msgstr ""
 
 #. MENU_ITEM_CMS_GAMUT_ALARM_COLOR
 msgid "Gamut alarm color"
-msgstr "Gamut Alarmfarbe"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_COLOR_BLACK
 msgid "Black"
-msgstr "Schwarz"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_COLOR_GRAY
 msgid "Gray"
-msgstr "Grau"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_COLOR_WHITE
+#, fuzzy
 msgid "White"
-msgstr "Weiss"
+msgstr "kirjoitus"
 
 #. SUBMENU_ITEM_CMS_COLOR_RED
+#, fuzzy
 msgid "Red"
-msgstr "Rot"
+msgstr "Supista"
 
 #. SUBMENU_ITEM_CMS_COLOR_GREEN
 msgid "Green"
-msgstr "Grün"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_COLOR_BLUE
+#, fuzzy
 msgid "Blue"
-msgstr "Blau"
+msgstr "Sumenna"
 
 #. MENU_ITEM_COUNTER_LEN_INACTIVE
 msgid "inactive"
-msgstr "nicht aktiv"
+msgstr ""
 
 #. MENU_ITEM_TIFF_COMP_NONE
 msgid "no compression"
-msgstr "keine Kompression"
+msgstr "ei pakkausta"
 
 #. MENU_ITEM_TIFF_COMP_CCITTRLE
 msgid "CCITT 1D Huffman compression"
-msgstr "CCITT 1D Huffman Kompression"
+msgstr "CCITT 1D Huffman -pakkaus"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
-msgstr "CCITT Gruppe 3 Fax Kompression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
+msgstr "CCITT Group 3 Fax -pakkaus"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
-msgstr "CCITT Gruppe 4 Fax Kompression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
+msgstr "CCITT Group 4 Fax -pakkaus"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
 msgid "JPEG DCT compression"
-msgstr "JPEG DCT Kompression"
+msgstr "JPEG DCT -pakkaus"
 
 #. MENU_ITEM_TIFF_COMP_PACKBITS
 msgid "pack bits"
-msgstr "gepackte Bits"
+msgstr ""
 
 #. MENU_ITEM_TIFF_COMP_DEFLATE
 msgid "deflate"
-msgstr "komprimiert"
+msgstr ""
 
 #. MENU_ITEM_RANGE_SCALE
 msgid "Slider (Scale)"
-msgstr "Schieber (Scale)"
+msgstr ""
 
 #. MENU_ITEM_RANGE_SCROLLBAR
 msgid "Slider (Scrollbar)"
-msgstr "Schieber (Scrollbalken)"
+msgstr ""
 
 #. MENU_ITEM_RANGE_SPINBUTTON
 msgid "Spinbutton"
-msgstr "Drehknopf"
+msgstr ""
 
 #. MENU_ITEM_RANGE_SCALE_SPIN
 msgid "Scale and Spinbutton"
-msgstr "Scale und Drehknopf"
+msgstr ""
 
 #. MENU_ITEM_RANGE_SCROLL_SPIN
 msgid "Scrollbar and Spinbutton"
-msgstr "Scrollbalken und Drehknopf"
+msgstr ""
 
 #. MENU_ITEM_LINEART_MODE_STANDARD
 msgid "Standard options window (lineart)"
-msgstr "Standard Optionen Fenster (b/w)"
+msgstr ""
 
 #. MENU_ITEM_LINEART_MODE_XSANE
 msgid "XSane main window (lineart)"
-msgstr "XSane Hauptfenster (b/w)"
+msgstr ""
 
 #. MENU_ITEM_LINEART_MODE_GRAY
 msgid "XSane main window (grayscale->lineart)"
-msgstr "XSane Hauptfenster (grau->b/w)"
+msgstr ""
 
 #. MENU_ITEM_SELECTION_NONE
 msgid "(none)"
-msgstr "(nichts)"
+msgstr "(ei mitään)"
 
 #. MENU_ITEM_FILETYPE_BY_EXT
 msgid "by ext"
-msgstr "nach Erw"
+msgstr ""
 
 #. MENU_ITEM_PRESET_AREA_ADD_SEL
 msgid "Add selection to list"
-msgstr "Auswahl zur Liste hinzufügen"
+msgstr "Lisää valinta luetteloon"
 
 #. MENU_ITEM_MEDIUM_ADD
 msgid "Add medium definition"
-msgstr "Mediumdefinition hinzufügen"
+msgstr ""
 
 #. MENU_ITEM_RENAME
 msgid "Rename item"
-msgstr "Eintrag umbenennen"
+msgstr "Muuta nimeä"
 
 #. MENU_ITEM_DELETE
 msgid "Delete item"
-msgstr "Eintrag löschen"
+msgstr "Poista"
 
 #. MENU_ITEM_MOVE_UP
 msgid "Move item up"
-msgstr "Eintrag nach oben schieben"
+msgstr "Siirrä ylös"
 
 #. MENU_ITEM_MOVE_DWN
 msgid "Move item down"
-msgstr "Eintrag nach unten schieben"
+msgstr "Siirrä alas"
 
 #. MENU_ITEM_AUTH_NONE
 msgid "no authentication"
-msgstr "keine Authentifizierung"
+msgstr ""
 
 #. MENU_ITEM_AUTH_POP3
 msgid "POP3 before SMTP"
-msgstr "POP3 bevor SMTP"
+msgstr ""
 
 #. MENU_ITEM_AUTH_ASMTP_PLAIN
 msgid "ASMTP Plain"
-msgstr "ASMTP Plain"
+msgstr ""
 
 #. MENU_ITEM_AUTH_ASMTP_LOGIN
 msgid "ASMTP Login"
-msgstr "ASMTP Login"
+msgstr ""
 
 #. MENU_ITEM_AUTH_ASMTP_CRAM_MD5
 msgid "ASMTP CRAM-MD5"
-msgstr "ASMTP CRAM-MD5"
+msgstr ""
 
 #. MENU_ITEM_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE
 msgid "Embed scanner ICM profile"
-msgstr "Scanner ICM-Profil einbinden"
+msgstr ""
 
 #. MENU_ITEM_CMS_FUNCTION_CONVERT_TO_SRGB
 msgid "Convert to sRGB"
-msgstr "Nach sRGB konvertieren"
+msgstr ""
 
 #. MENU_ITEM_FUNCTION_CONVERT_TO_WORKING_CS
 msgid "Convert to working color space"
-msgstr "In Arbeitsfarbraum konvertieren"
+msgstr ""
 
 #. PROGRESS_SCANNING
 msgid "Scanning"
-msgstr "Scanne"
+msgstr "Luetaan kuvaa"
 
 #. PROGRESS_RECEIVING_FRAME_DATA
 #, c-format
 msgid "Receiving %s data"
-msgstr "Empfange %s Daten"
+msgstr "Vastaanotetaan dataa %s"
 
 #. PROGRESS_PAGE
 msgid "page"
-msgstr "Seite"
+msgstr ""
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
-msgstr "Bild übertragen"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
+msgstr "Siirretään kuvaa"
 
 #. PROGRESS_ROTATING_DATA
 msgid "Rotating image"
-msgstr "Bild drehen"
+msgstr "Kierretään kuvaa"
 
 #. PROGRESS_MIRRORING_DATA
 msgid "Mirroring image"
-msgstr "Bild spiegeln"
+msgstr "Peilataan kuvaa"
 
 #. PROGRESS_PACKING_DATA
 msgid "Packing image"
-msgstr "Bild packen"
+msgstr "Pakataan kuvaa"
 
 #. PROGRESS_CONVERTING_DATA
 msgid "Converting image"
-msgstr "Bild konvertieren"
+msgstr "Muunnetaan kuvaa"
 
 #. PROGRESS_SAVING_DATA
 msgid "Saving image"
-msgstr "Bild speichern"
+msgstr "Tallennetaan kuvaa"
 
 #. PROGRESS_CLONING_DATA
 msgid "Cloning image"
-msgstr "Bild clonen"
+msgstr "Kloonataan kuvaa"
 
 #. PROGRESS_SCALING_DATA
 msgid "Scaling image"
-msgstr "Bild skalieren"
+msgstr "Skaalataan kuvaa"
 
 #. PROGRESS_DESPECKLING_DATA
 msgid "Despeckling image"
-msgstr "Flecken entfernen"
+msgstr "Poistetaan laikkuja"
 
 #. PROGRESS_BLURING_DATA
 msgid "Bluring image"
-msgstr "Bild weichzeichnen"
+msgstr "Sumennetaan kuvaa"
 
 #. PROGRESS_OCR
 msgid "OCR in progress"
-msgstr "Texterkennung"
+msgstr "OCR käynnissä"
 
 #. PROGRESS_ICM_CONVERSION
+#, fuzzy
 msgid "converting colors"
-msgstr "konvertiere Farben"
+msgstr "Korjaa värit automaattisesti"
 
 #. DESC_SCAN_START
 msgid "Start scan <Ctrl-Enter>"
-msgstr "Scan starten <Ctrl-Enter>"
+msgstr "Aloita kuvanluku <Ctrl-Enter>"
 
 #. DESC_SCAN_CANCEL
 msgid "Cancel scan <ESC>"
-msgstr "Scan abbrechen <ESC>"
+msgstr "Peru kuvanluku <ESC>"
 
 #. DESC_PREVIEW_ACQUIRE
 msgid "Acquire preview scan <Alt-p>"
-msgstr "Vorschauscan <Alt-p>"
+msgstr "Lue esikatselukuva <Alt-p>"
 
 #. DESC_PREVIEW_CANCEL
 msgid "Cancel preview scan <Alt-ESC>"
-msgstr "Vorschauscan abbrechen <Alt-ESC>"
+msgstr "Peru esikatselukuvanluku <Alt-ESC>"
 
 #. DESC_XSANE_MODE
 msgid ""
 "viewer-<Ctrl-v>, save-<Ctrl-s>, photocopy-<Ctrl-c>, multipage-<Ctrl-m>, fax-"
 "<Ctrl-f> or e-mail-<Ctrl-e>"
 msgstr ""
-"Betrachter-<Strg-v>, speichern-<Strg-s> kopieren-<Strg-c>, Mehrseiten-<Strg-"
-"m>, Fax-<Strg-f> oder E-Mail-<Ctrl-e>"
 
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
 msgstr ""
-"Quellmedium auswählen.\n"
-"Zum Umbenennen, Umsortieren oder Löschen eines Eintrags das Kontextmenü "
-"benutzen (rechter Mausknopf).\n"
-"Um ein neues Medium zu erzeugen, Option Medium ändern im Einstellungsmenü "
-"aktivieren."
 
 #. DESC_FILENAME_COUNTER_STEP
 msgid "Value that is added to filenamecounter after scan"
-msgstr "Wert, der nach einem Scan zum Dateinamenzähler addiert wird"
+msgstr ""
 
 #. DESC_BROWSE_FILENAME
 msgid "Browse for image filename"
-msgstr "Suche nach Bild-Dateinamen"
+msgstr ""
 
 #. DESC_FILENAME
 msgid "Filename for scanned image"
-msgstr "Dateiname für gescanntes Bild"
+msgstr "Tiedostonimi skannatulle kuvalle"
 
 #. DESC_FILETYPE
 msgid ""
 "Type of image format, the suitable filename extension is automatically added "
 "to the filename"
 msgstr ""
-"Dateiformat, die passende Dateinamen-Erweiterung wird automatisch an den "
-"Dateinamen angehängt"
+"Kuvamuodon tyyppi, sopiva tiedostopääte lisätään tiedostonimeen "
+"automaattisesti"
 
 #. DESC_FAXPROJECT
 msgid "Enter fax project directory name"
-msgstr "Faxprojekt-Verzeichnis Namen eingeben"
+msgstr ""
 
 #. DESC_FAXPAGENAME
 msgid "Enter new name for faxpage"
-msgstr "Name der Faxseite eingeben"
+msgstr "Syötä faksisivun uusi nimi"
 
 #. DESC_FAXRECEIVER
 msgid "Enter receiver phone number or address"
-msgstr "Telefonnummer des Empfängers eingeben"
+msgstr "Syötä vastaanottajan puhelinnumero tai osoite"
 
 #. DESC_FAX_PROJECT_BROWSE
+#, fuzzy
 msgid "Browse for fax project directory"
-msgstr "Nach Faxprojekt-Verzeichnis suchen"
+msgstr "Selaa väliaikaistiedostoja"
 
 #. DESC_EMAIL_PROJECT
 msgid "Enter e-mail project directory name"
-msgstr "Email-Projekt-Verzeichnis Namen eingeben"
+msgstr ""
 
 #. DESC_EMAIL_IMAGENAME
 msgid "Enter new name for e-mail image"
-msgstr "neuen Name für E-Mail Bild eingeben"
+msgstr ""
 
 #. DESC_EMAIL_RECEIVER
 msgid "Enter e-mail address"
-msgstr "E-Mail Adresse eingeben"
+msgstr ""
 
 #. DESC_EMAIL_PROJECT_BROWSE
+#, fuzzy
 msgid "Browse for email project directory"
-msgstr "Nach Email-Projekt-Verzeichnis suchen"
+msgstr "Selaa väliaikaistiedostoja"
 
 #. DESC_EMAIL_SUBJECT
 msgid "Enter subject of e-mail"
-msgstr "Betreff der E-Mail eingeben"
+msgstr ""
 
 #. DESC_EMAIL_FILETYPE
 msgid "Select filetype for image attachments"
-msgstr "Dateityp für E-Mailanhang auswählen"
+msgstr "Valitse tiedostomuoto kuvaliitteille"
 
 #. DESC_MULTIPAGE_PROJECT
 msgid "Enter multipage project directory name"
-msgstr "Mehrseiten-Projekt-Verzeichnis Namen eingeben"
+msgstr ""
 
 #. DESC_MULTIPAGE_PROJECT_BROWSE
+#, fuzzy
 msgid "Browse for multipage project directory"
-msgstr "Nach Mehrseiten-Projekt-Verzeichnis suchen"
+msgstr "Selaa väliaikaistiedostoja"
 
 #. DESC_MULTIPAGE_FILETYPE
 msgid "Select filetype for multipage file"
-msgstr "Dateityp für mehrseitiges Projekt auswählen"
+msgstr ""
 
 #. DESC_PRESET_AREA_RENAME
 msgid "Enter new name for preset area"
-msgstr "Name der Gebietsvoreinstellung eingeben"
+msgstr "Syötä uusi nimi esivalitulle alueelle"
 
 #. DESC_PRESET_AREA_ADD
 msgid "Enter name for new preset area"
-msgstr "Namen für Gebietsvoreinstellung eingeben"
+msgstr "Syötä nimi uudelle esivalitulle alueelle"
 
 #. DESC_MEDIUM_RENAME
 msgid "Enter new name for medium definition"
-msgstr "Namen für Mediendefinition eingeben"
+msgstr ""
 
 #. DESC_MEDIUM_ADD
 msgid "Enter name for new medium definition"
-msgstr "Namen für Mediendefinition eingeben"
+msgstr ""
 
 #. DESC_PRINTER_SELECT
 msgid "Select printerdefinition <Shift-F1/F2/...>"
-msgstr "Wähle Druckerdefinition <Shift-F1/F2/...>"
+msgstr ""
 
 #. DESC_RESOLUTION
 msgid "Set scan resolution"
-msgstr "Bestimmt die Scanauflösung"
+msgstr "Aseta kuvanluvun tarkkuus"
 
 #. DESC_RESOLUTION_X
 msgid "Set scan resolution for x direction"
-msgstr "Bestimmt die Scanauflösung in X-Richtung"
+msgstr "Aseta kuvanluvun tarkkuus x-akselin suuntaan"
 
 #. DESC_RESOLUTION_Y
 msgid "Set scan resolution for y direction"
-msgstr "Bestimmt die Scanauflösung in Y-Richtung"
+msgstr "Aseta kuvanluvun tarkkuus y-akselin suuntaan"
 
 #. DESC_ZOOM
 msgid "Set zoomfactor"
-msgstr "Bestimmt den Vergrößerungsfaktor"
+msgstr "Aseta suurennuskerroin"
 
 #. DESC_ZOOM_X
 msgid "Set zoomfactor for x direction"
-msgstr "Bestimmt den Vergrößerungsfaktor in X-Richtung"
+msgstr "Asenna suurennuskerroin x-akselin suuntaan"
 
 #. DESC_ZOOM_Y
 msgid "Set zoomfactor for y direction"
-msgstr "Bestimmt den Vergrößerungsfaktor in Y-Richtung"
+msgstr "Aseta suurennuskerroin y-akselin suuntaan"
 
 #. DESC_COPY_NUMBER
 msgid "Set number of copies"
-msgstr "Bestimmt die Anzahl der Kopien"
+msgstr "Aseta kopioiden määrä"
 
 #. DESC_NEGATIVE
 msgid "Negative: Invert colors for scanning negatives <Ctrl-n>"
-msgstr "Negativ: Invertiere Farben, zum Scannen von Negativen <Ctrl-n>"
+msgstr "Negatiivi: Käänteiset värit negatiivien skannausta varten <Ctrl-n>"
 
 #. DESC_GAMMA
 msgid "Set gamma value"
-msgstr "Bestimmt Gammawert"
+msgstr "Aseta gamma-arvo"
 
 #. DESC_GAMMA_R
 msgid "Set gamma value for red component"
-msgstr "Bestimmt Gammawert für rote Komponente"
+msgstr ""
 
 #. DESC_GAMMA_G
 msgid "Set gamma value for green component"
-msgstr "Bestimmt Gammawert für grüne Komponente"
+msgstr ""
 
 #. DESC_GAMMA_B
 msgid "Set gamma value for blue component"
-msgstr "Bestimmt Gammawert für blaue Komponente"
+msgstr ""
 
 #. DESC_BRIGHTNESS
 msgid "Set brightness"
-msgstr "Bestimmt Helligkeit"
+msgstr "Aseta kirkkaus"
 
 #. DESC_BRIGHTNESS_R
 msgid "Set brightness for red component"
-msgstr "Bestimmt Helligkeit für rote Komponente"
+msgstr ""
 
 #. DESC_BRIGHTNESS_G
 msgid "Set brightness for green component"
-msgstr "Bestimmt Helligkeit für grüne Komponente"
+msgstr ""
 
 #. DESC_BRIGHTNESS_B
 msgid "Set brightness for blue component"
-msgstr "Bestimmt Helligkeit für blaue Komponente"
+msgstr ""
 
 #. DESC_CONTRAST
 msgid "Set contrast"
-msgstr "Bestimmt Kontrast"
+msgstr "Aseta kontrasti"
 
 #. DESC_CONTRAST_R
 msgid "Set contrast for red component"
-msgstr "Bestimmt Kontrast für rote Komponente"
+msgstr ""
 
 #. DESC_CONTRAST_G
 msgid "Set contrast for green component"
-msgstr "Bestimmt Kontrast für grüne Komponente"
+msgstr ""
 
 #. DESC_CONTRAST_B
 msgid "Set contrast for blue component"
-msgstr "Bestimmt Kontrast für blaue Komponente"
+msgstr ""
 
 #. DESC_THRESHOLD
 msgid "Set threshold"
-msgstr "Schwellwert setzen"
+msgstr "Aseta kynnysarvo"
 
 #. DESC_RGB_DEFAULT
 msgid ""
@@ -1815,15 +1829,11 @@ msgid ""
 " brightness = 0\n"
 " contrast = 0"
 msgstr ""
-"RGB Standard: Setzt Farbverbesserungswerte für rot, grün und blau auf "
-"Standardwerte <Ctrl-b>:\n"
-"Gamma = 1.0\n"
-"Helligkeit = 0\n"
-"Kontrast = 0"
 
 #. DESC_ENH_AUTO
+#, fuzzy
 msgid "Autoadjust gamma, brightness and contrast <Ctrl-a>"
-msgstr "Automatische Einstellung von Gamma, Helligkeit und Kontrast <Ctrl-a>"
+msgstr "Säädä gamma, kirkkaus ja kontrasti automaattisesti <Ctrl-e>"
 
 #. DESC_ENH_DEFAULT
 msgid ""
@@ -1832,682 +1842,666 @@ msgid ""
 "brightness = 0\n"
 "contrast = 0"
 msgstr ""
-"Setze Standardwerte für Farbverbesserung <Ctrl-0>:\n"
-"Gamma = 1.0\n"
-"Helligkeit = 0\n"
-"Kontrast = 0"
 
 #. DESC_ENH_RESTORE
 msgid "Restore enhancement values from preferences <Ctrl-r>"
-msgstr "Lade Farbverbesserungswerte aus Einstellungen <Ctrl-r>"
+msgstr ""
 
 #. DESC_ENH_STORE
 msgid "Store active enhancement values to preferences <Ctrl-+>"
-msgstr "Speichere Farbverbesserungswerte in Einstellungen <Ctrl-m>"
+msgstr ""
 
 #. DESC_HIST_INTENSITY
 msgid "Show histogram of intensity/gray <Alt-i>"
-msgstr "Zeige Histogramm für Intensität/grau <Alt-i>"
+msgstr ""
 
 #. DESC_HIST_RED
 msgid "Show histogram of red component <Alt-r>"
-msgstr "Zeige Histogramm für rote Komponente <Alt-r>"
+msgstr ""
 
 #. DESC_HIST_GREEN
 msgid "Show histogram of green component <Alt-g>"
-msgstr "Zeige Histogramm für grüne Komponente <Alt-g>"
+msgstr ""
 
 #. DESC_HIST_BLUE
 msgid "Show histogram of blue component <Alt-b>"
-msgstr "Zeige Histogramm für blaue Komponente <Alt-b>"
+msgstr ""
 
 #. DESC_HIST_PIXEL
 msgid "Display mode: show histogram with lines instead of pixels <Alt-m>"
-msgstr "Zeichne Histogramm mit Linien anstatt mit Punkten <Alt-m>"
+msgstr ""
 
 #. DESC_HIST_LOG
 msgid "Show logarithm of pixelcount <Alt-l>"
-msgstr "Benutze Logarithmus der Pixelzahlen <Alt-l>"
+msgstr ""
 
 #. DESC_PRINTER_SETUP
 msgid "Select definition to change"
-msgstr "Auswahl der zu ändernden Definition"
+msgstr ""
 
 #. DESC_PRINTER_NAME
 msgid "Define a name for the selection of this definition"
-msgstr "Namen der Definition"
+msgstr ""
 
 #. DESC_PRINTER_COMMAND
 msgid "Enter command to be executed in copy mode (e.g. \"lpr\")"
-msgstr ""
-"Befehl der im Kopiermodus zum Drucken ausgeführt werden soll (z.B. \"lpr\")"
+msgstr "Syötä komento, joka suoritetaan kopiointitilassa (esim. \"lpr\")"
 
 #. DESC_COPY_NUMBER_OPTION
 msgid "Enter option for copy numbers"
-msgstr "Option, mit der die Anzahl der Kopien angegeben wird"
+msgstr "Syötä valitsin kopioiden määrän määrittämiseksi"
 
 #. DESC_PRINTER_LINEART_RESOLUTION
 msgid ""
 "Resolution with which lineart images are printed and saved in postscript"
 msgstr ""
-"Auflösung, mit der Lineart-Bilder gedruckt und im Postscriptformat "
-"gespeichert werden"
 
 #. DESC_PRINTER_GRAYSCALE_RESOLUTION
 msgid ""
 "Resolution with which grayscale images are printed and saved in postscript"
 msgstr ""
-"Auflösung, mit der Graustufen-Bilder gedruckt und im Postscriptformat "
-"gespeichert werden"
+"Resoluutio, jolla mustavalkokuvat tulostetaan ja tallennetaan postscriptinä"
 
 #. DESC_PRINTER_COLOR_RESOLUTION
 msgid "Resolution with which color images are printed and saved in postscript"
-msgstr ""
-"Auflösung, mit der Farb-Bilder gedruckt und im Postscriptformat gespeichert "
-"werden"
+msgstr "Resoluutio, jolla värikuvat tulostetaan ja tallennetaan postscriptinä"
 
 #. DESC_PRINTER_WIDTH
 #. DESC_FAX_WIDTH
 msgid "Width of printable area"
-msgstr "Breite des druckbaren Bereichs"
+msgstr "Tulostusalueen leveys"
 
 #. DESC_PRINTER_HEIGHT
 #. DESC_FAX_HEIGHT
 msgid "Height of printable area"
-msgstr "Höhe des druckbaren Bereichs"
+msgstr "Tulostusalueen korkeus"
 
 #. DESC_PRINTER_LEFTOFFSET
 #. DESC_FAX_LEFTOFFSET
 msgid "Left offset from the edge of the paper to the printable area"
-msgstr "Abstand vom linken Papierrand zum Beginn des druckbaren Bereichs"
+msgstr "Vasen marginaali paperin reunasta tulostusalueeseen"
 
 #. DESC_PRINTER_BOTTOMOFFSET
 #. DESC_FAX_BOTTOMOFFSET
 msgid "Bottom offset from the edge of the paper to the printable area"
-msgstr "Abstand vom unteren Papierrand zum Beginn des druckbaren Bereichs"
+msgstr "Alamarginaali paperin reunasta tulostusalueeseen"
 
 #. DESC_PRINTER_GAMMA
 msgid "Additional gamma value for photocopy"
-msgstr "Zusätzlicher Gammawert beim Fotokopieren"
+msgstr ""
 
 #. DESC_PRINTER_GAMMA_RED
 msgid "Additional gamma value for red component for photocopy"
-msgstr "Zusätzlicher Gammawert für rote Komponente beim Fotokopieren"
+msgstr ""
 
 #. DESC_PRINTER_GAMMA_GREEN
 msgid "Additional gamma value for green component for photocopy"
-msgstr "Zusätzlicher Gammawert für grüne Komponente beim Fotokopieren"
+msgstr ""
 
 #. DESC_PRINTER_GAMMA_BLUE
 msgid "Additional gamma value for blue component for photocopy"
-msgstr "Zusätzlicher Gammawert für blaue Komponente beim Fotokopieren"
+msgstr ""
 
 #. DESC_PRINTER_EMBED_CSA
 msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-msgstr "Erzeugt eine Postscriptdatei die das ICM-Profil des Scammers enthält"
+msgstr ""
 
 #. DESC_PRINTER_EMBED_CRD
 msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-msgstr "Erzeugt eine Postscriptdatei die das ICM-Profil des Druckers enthält"
+msgstr ""
 
 #. DESC_PRINTER_CMS_BPC
-#, fuzzy
 msgid "Applies black point compensation"
-msgstr "Schwarzpunkt kompensieren"
+msgstr ""
 
 #. DESC_PRINTER_PS_FLATEDECODED
 msgid ""
 "Create zlib compressed postscript image for printer (flatedecode).\n"
 "The printer has to understand postscript level 3!"
 msgstr ""
-"Erzeuge zlib-komprimiertes Postscript Bild zum Drucken (flatdecode).\n"
-"Der Drucker muss Postscript level 3 verstehen!"
 
 #. DESC_TMP_PATH
 msgid "Path to temp directory"
-msgstr "Pfad zum temporären Verzeichnis"
+msgstr "Polku väliaikaistiedostojen hakemistoon"
 
 #. DESC_BUTTON_TMP_PATH_BROWSE
 msgid "Browse for temporary directory"
-msgstr "Nach temporärem Verzeichnis suchen"
+msgstr "Selaa väliaikaistiedostoja"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
-"Qualität in Prozent wenn Bild als JPEG oder als TIFF mit JPEG-Kompression "
-"gespeichert wird"
+"Laatu prosentteina kun kuva tallennetaan JPEG-muodossa tai TIFF-muodossa "
+"JPEG-pakkauksella"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
-msgstr "Kompression wenn Bild im PNG-Format gespeichert wird"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
+msgstr "Pakkaus tallennettaessa PNG:nä"
 
 #. DESC_FILENAME_COUNTER_LEN
 msgid "Minimum length of counter in filename"
-msgstr "Minimale Länge des Zählers im Dateinamen"
+msgstr ""
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr ""
-"ZIP-Kompressionsrate wenn Bild im komprimierten TIFF-Format gespeichert wird"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
-msgstr "Kompression wenn 16 bit Bild im TIFF-Format gespeichert wird"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
+msgstr "Pakkaustapa tallennettaessa 16-bittistä kuvaa TIFFinä"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
-msgstr "Kompression wenn 8 bit Bild im TIFF-Format gespeichert wird"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
+msgstr "Pakkaustapa tallennettaessa 8-bittistä kuvaa TIFFinä"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
-msgstr "Kompression wenn lineart Bild im TIFF-Format gespeichert wird"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
+msgstr "Pakkaustapa tallennettaessa 8-bittistä kuvaa TIFFinä"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device dependant preferences in default file at exit of xsane"
 msgstr ""
-"Geräteabhängige Einstellungen werden in der Default-Datei beim Beenden von "
-"xsane gespeichert"
+"Tallenna laiteriippuvaiset asetukset oletustiedostoon poistuttaessa xsanesta"
 
 #. DESC_OVERWRITE_WARNING
 msgid "Warn before overwriting an existing file"
-msgstr "Warne vorm Überschreiben existierender Dateien"
+msgstr "Varoita ennen tiedostojen korvaamista"
 
 #. DESC_SKIP_EXISTING
 msgid ""
 "If filename counter is automatically increased, used numbers are skipped"
 msgstr ""
-"Wenn der Dateinamenzähler automatisch erhöht wird, werden benutzte "
-"Dateinummern übersprungen"
 
 #. DESC_SAVE_PS_FLATEDECODED
 msgid ""
 "compress postscript image with zlib algorithm (flatedecode). When you want "
 "to print such a file your printer has to understand postscript level 3"
 msgstr ""
-"komprimiere Postscript Bild mit zlib Algorithmus (flatedecode). Wenn die "
-"Datei gedruckt werden soll muss der Drucker Postscript level 3 verstehen"
 
 #. DESC_SAVE_PDF_FLATEDECODED
 msgid "compress PDF image with zlib algorithm (flatedecode)."
-msgstr "komprimiere PDF Bild mit zlib Algorithmus (flatedecode)."
+msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
-"Speicher 16 Bit PNM-Bilder im ASCII Format anstatt im Binär Format. Das "
-"Binär Format ist ein neues Format, das nicht von allen Programmen "
-"unterstützt wird. Das ASCII Format wird von mehr Programmen unterstützt, "
-"aber die Dateien werden sehr groß!!!"
+"Kun 16-bittinen kuva tallennetaan PNM-muodossa, käytä ASCII-muotoa "
+"binäärimuodon sijasta. Binäärimuoto on uusi, eikä kaikki ohjelmat tue sitä. "
+"ASCII-muoto on tuetumpi, mutta se tuottaa todella suuria tiedostoja!!!"
 
 #. DESC_REDUCE_16BIT_TO_8BIT
+#, fuzzy
 msgid ""
 "If scanner sends image with 16 bits/channel save image with 8 bits/channel"
 msgstr ""
-"Wenn der Scanner das Bild mit 16 Bits/Kanal liefert wird das Bild mit 8 Bits/"
-"Kanal gespeichert"
+"Jos skanneri lähettää kuvaa muodossa 16 bittiä/väri, tallenna kuva muodossa "
+"8 bittiä/väri"
 
 #. DESC_PSFILE_WIDTH
 msgid "Width of paper for postscript files"
-msgstr "Breite des druckbaren Bereichs für Postscript"
+msgstr "Paperin leveys postscript-tiedostoille"
 
 #. DESC_PSFILE_HEIGHT
 msgid "Height of paper for postscript files"
-msgstr "Höhe des druckbaren Bereichs für Postscript"
+msgstr "Paperin korkeus postscript-tiedostoille"
 
 #. DESC_PSFILE_LEFTOFFSET
 msgid ""
 "Left offset from the edge of the paper to the usable area for postscript "
 "files"
 msgstr ""
-"Abstand vom linken Papierrand zum Beginn des druckbaren Bereichs für "
-"Postsciptdateien"
+"Vasen marginaali postscript-tiedostoille paperin reunasta tulostusalueelle"
 
 #. DESC_PSFILE_BOTTOMOFFSET
 msgid ""
 "Bottom offset from the edge of the paper to the usable area for postscript "
 "files"
 msgstr ""
-"Abstand vom unteren Papierrand zum Beginn des druckbaren Bereichs für "
-"Postsciptdateien"
+"Alamarginaali postscript-tiedostoille paperin reunasta tulostusalueelle"
 
 #. DESC_MAIN_WINDOW_FIXED
 msgid "Use fixed main window size or scrolled, resizable main window"
-msgstr "Verwende feste oder veränderbare Hauptfenstergröße"
+msgstr ""
 
 #. DESC_DISABLE_GIMP_PREVIEW_GAMMA
+#, fuzzy
 msgid "Disable preview gamma when XSane runs as GIMP plugin"
-msgstr "Preview Gamma deaktivieren wenn XSane als Gimp-Plugin gestartet wird"
+msgstr ""
+"Poista esikatselun gammakorjaus käytöstä, kun XSane on käytössä GIMP-"
+"liitännäisenä"
 
 #. DESC_PREVIEW_COLORMAP
 msgid "Use an own colormap for preview if display depth is 8 bpp"
 msgstr ""
-"Benutze eigene Farbpalette für Vorschaubild, wenn die Bildschirmfarbtiefe 8 "
-"Bit beträgt"
+"Käytä omaa värikarttaa esikatselussa jos väritarkkuus on 8 bittiä pikselille"
 
 #. DESC_SHOW_RANGE_MODE
 msgid "Select how a range is displayed"
-msgstr "Bestimmen Sie, wie die Auswahle eines Bereichs dargestellt wird"
+msgstr ""
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
-msgstr "Wert, mit dem die berechnete Vorschauauflösung multipliziert wird"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
+msgstr "Esikatselukuvan resoluution kerroin"
 
 #. DESC_PREVIEW_GAMMA
 msgid "Set gamma correction value for preview image"
-msgstr "Bestimme Gammwert für Vorschaubild"
+msgstr "Aseta gammakorjaus esikatselukuvalle"
 
 #. DESC_PREVIEW_GAMMA_RED
 msgid "Set gamma correction value for red component of preview image"
-msgstr "Bestimme Gammwert der roten Komponente für Vorschaubild"
+msgstr "Aseta gammakorjaus esikatselukuvan punaiselle komponentille"
 
 #. DESC_PREVIEW_GAMMA_GREEN
 msgid "Set gamma correction value for green component of preview image"
-msgstr "Bestimme Gammwert der grünen Komponente für Vorschaubild"
+msgstr "Aseta gammakorjaus esikatselukuvan vihreälle komponentille"
 
 #. DESC_PREVIEW_GAMMA_BLUE
 msgid "Set gamma correction value for blue component of preview image"
-msgstr "Bestimme Gammwert der blauen Komponente für Vorschaubild"
+msgstr "Aseta gammakorjaus esikatselukuvan siniselle komponentille"
 
 #. DESC_LINEART_MODE
 msgid "Define the way XSane shall handle the threshold option"
-msgstr "Definiert die Art, wie XSane die Schwellwert-Option behandeln soll"
+msgstr ""
 
 #. DESC_GRAYSCALE_SCANMODE
 msgid ""
 "Select grayscale scanmode. This scanmode is used for lineart preview scan "
 "when transformation from grayscale to lineart is enabled"
 msgstr ""
-"Name des Graustufen-Scanmodus auswählen. Dieser Scanmodus wird beim Schwarz-"
-"Weiß Vorschauscan verwendet, wenn Umwandlung von Graustufen in Schwarz/Weiß "
-"aktiviert ist."
 
 #. DESC_PREVIEW_THRESHOLD_MIN
 #, no-c-format
 msgid "The scanner's minimum threshold level in %"
-msgstr "Minimaler Schwellwert des Scanners in %"
+msgstr ""
 
 #. DESC_PREVIEW_THRESHOLD_MAX
 #, no-c-format
 msgid "The scanner's maximum threshold level in %"
-msgstr "Maximaler Schwellwert des Scanners in %"
+msgstr ""
 
 #. DESC_PREVIEW_THRESHOLD_MUL
 msgid ""
 "Multiplier to make XSane threshold range and scanner threshold range the same"
 msgstr ""
-"Multiplikator um XSane's Schwellwertbereich und den Schwellwertbereich des "
-"Scanners aufeinander abzustimmen"
 
 #. DESC_PREVIEW_THRESHOLD_OFF
 msgid ""
 "Offset to make XSane threshold range and scanner threshold range the same"
 msgstr ""
-"Schwellwertverschiebung um XSane's Schwellwertbereich und den "
-"Schwellwertbereich des Scanners aufeinander abzustimmen"
 
 #. DESC_ADF_PAGES_MAX
 msgid "Number of pages to scan"
-msgstr "Anzahl der zu scannenden Seiten"
+msgstr ""
 
 #. DESC_PREVIEW_PIPETTE_RANGE
 msgid "dimension of square that is used to average color for pipette function"
 msgstr ""
-"Größe des Quadrats, das zum Mitteln der Farbe für die Pipette Funktion "
-"benutzt wird"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
-"Befehl, der ausgeführt werden soll, um Hilfedateien anzuzeigen, muß ein HTML-"
-"Betrachter sein!"
+"Syötä komento, joka suoritetaan ohjetiedostojen katselemiseksi (täytyy tukea "
+"HTML:ää)."
 
 #. DESC_AUTOENHANCE_GAMMA
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr ""
-"Gamma Wert wird angepasst wenn Knopf für automatische Verbesserung gedrückt "
-"wird"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
-msgstr "Scanbereich nach Vorschauscan automatisch auswählen"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
+msgstr "Valitse skannausalue esikatseluskannauksen valmistuttua"
 
 #. DESC_AUTOCORRECT_COLORS
 msgid "Do color correction after preview scan has finished"
-msgstr "Farbkorrektur nach Vorschauscan ausführen"
+msgstr "Tee värinkorjaus esikatseluskannauksen valmistuttua"
 
 #. DESC_RENDERING_INTENT
+#, fuzzy
 msgid "Select rendering intent for preview and saving"
-msgstr "Rendering Intent für Vorschau und zum Speichern auswählen"
+msgstr "Valitse skannausalue esikatseluskannauksen valmistuttua"
 
 #. DESC_CMS_BPC
 msgid "Apply black point compensation when color transformation is done"
-msgstr "Scharzpunkt-Kompensation bei Farbtransformation anwenden"
+msgstr ""
 
 #. DESC_FAX_COMMAND
 msgid "Enter command to be executed in fax mode"
-msgstr "Befehl, der zum Senden eines Faxprojekts ausgeführt werden soll"
+msgstr "Syötä komento, joka suoritetaan faksitilassa"
 
 #. DESC_FAX_RECEIVER_OPT
 msgid "Enter option to specify receiver"
-msgstr "Option, mit der die Empfängertelefonnummer angegeben wird"
+msgstr "Syötä valitsin vastaanottajan määrittämiseksi"
 
 #. DESC_FAX_POSTSCRIPT_OPT
 msgid "Enter option to specify postscript files following"
-msgstr ""
-"Option, mit der angegeben wird, dass der Dateiname einer Postscriptdatei "
-"folgt"
+msgstr "Syötä valitsin, jolla määritetään postscript-tiedostot"
 
 #. DESC_FAX_NORMAL_OPT
 msgid "Enter option to specify normal mode (low resolution)"
-msgstr "Option, mit der die vertikale Auflösung auf 98 lpi gestellt wird"
+msgstr "Syötä valitsin, jolla määritetään matalaresoluutiotila (tavallinen)"
 
 #. DESC_FAX_FINE_OPT
 msgid "Enter option to specify fine mode (high resolution)"
-msgstr "Option, mit der die vertikale Auflösung auf 196 lpi gestellt wird"
+msgstr "Syötä valitsin, jolla määritetään korkearesoluutiotila"
 
 #. DESC_FAX_VIEWER
 msgid "Enter command to be executed to view a fax"
-msgstr ""
-"Befehl, der ausgeführt werden soll, um Faxseiten(Postscript) anzuzeigen"
+msgstr "Syötä komento, joka suoritetaan faksin katselemiseksi"
 
 #. DESC_FAX_FINE_MODE
 msgid "Send fax with high vertical resolution (196 lpi instead of 98 lpi)"
-msgstr "Sende Fax mit hoher vertikaler Auflösung (196 lpi anstatt 98 lpi)"
+msgstr "Lähetä faksi korkealla vaakaresoluutiolla (196 lpi 98 lpi:n sijasta)"
 
 #. DESC_FAX_PS_FLATEDECODED
 msgid "Create zlib compressed postscript image for fax (flatedecode)"
-msgstr "Erzeuge zlib-komprimiertes Postscript-Bild (ps level 3) zum Faxen"
+msgstr ""
 
 #. DESC_SMTP_SERVER
 msgid "IP Address or Domain name of SMTP server"
-msgstr "IP Adresse oder Domain Name des SMTP Servers"
+msgstr "SMTP-palvelimen osoite"
 
 #. DESC_SMTP_PORT
 msgid "port to connect to SMTP server"
-msgstr "Port, auf dem zum SMTP Server verbunden werden soll"
+msgstr "SMTP-palvelimen portti"
 
 #. DESC_EMAIL_FROM
 msgid "enter your e-mail address"
-msgstr "Geben Sie Ihre E-Mail Adresse ein"
+msgstr ""
 
 #. DESC_EMAIL_REPLY_TO
 msgid "enter e-mail address for replied e-mails"
-msgstr "Geben Sie die E-Mail Adresse für Antworten auf diese E-Mail ein"
+msgstr ""
 
 #. DESC_EMAIL_AUTHENTICATION
 msgid "Type of authentication before sending e-mail"
-msgstr "Art der Authentifizierung bevor E-Mail gesendet wird"
+msgstr ""
 
 #. DESC_EMAIL_AUTH_USER
 msgid "user name for e-mail server"
-msgstr "Benutername für den E-Mail-Server"
+msgstr ""
 
 #. DESC_EMAIL_AUTH_PASS
 msgid "password for e-mail server"
-msgstr "Passwort für den E-Mail-Server"
+msgstr ""
 
 #. DESC_POP3_SERVER
 msgid "IP Address or Domain name of POP3 server"
-msgstr "IP Adresse oder Domain Name des POP3-Servers"
+msgstr "POP3-palvelimen osoite"
 
 #. DESC_POP3_PORT
 msgid "port to connect to POP3 server"
-msgstr "Port, auf dem zum POP3-Server verbunden werden soll"
+msgstr "POP3-palvelimen portti"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
-msgstr "E-Mail wird im hmtl Modus gesandt, Bild platzieren mit: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
+msgstr ""
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
-msgstr "OCR Befehl eingeben"
+#, fuzzy
+msgid "Enter command to start OCR program"
+msgstr "Syötä komento OCR-ohjelman käynnistämiseksi"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
-msgstr "Eingabe-Datei-Option für OCR Programm eingeben"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
+msgstr "Syötä valitsin, jolla OCR-ohjelmalle määritetään syötetiedosto"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
-msgstr "Ausgabe-Datei-Option für OCR Programm eingeben"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
+msgstr "Syötä valitsin, jolla OCR-ohjelmalle määritetään tulostetiedosto"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
-msgstr ""
-"Definieren Sie, ob das OCR Programm eine GUI-Fortschritts-Pipe unterstützt"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
+msgstr "Määrittele, tukeeko OCR-ohjelma GUI-edistymisputkea"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
-"Geben Sie die Option des OCR Programms ein, mit der der Ausgabefildeskriptor "
-"im GUI Mode übergeben wird"
+"Syötä valitsin, jolla OCR-ohjelmalle määritetään tiedostokahva GUI-tilassa"
 
 #. DESC_OCR_PROGRESS_KEYWORD
 msgid "Define Keyword that is used to mark progress information"
-msgstr ""
-"Definieren Sie das Schlüsselwort, das benutzt wird, um Fortschritssangaben "
-"zu kennzeichenen"
+msgstr "Määritä avainsana jota käytetään merkittäessä edistymistietoja"
 
 #. DESC_PERMISSION_READ
 msgid "read"
-msgstr "lesen"
+msgstr "luku"
 
 #. DESC_PERMISSION_WRITE
 msgid "write"
-msgstr "schreiben"
+msgstr "kirjoitus"
 
 #. DESC_PERMISSION_SEARCH
+#, fuzzy
 msgid "search"
-msgstr "durchsuchen"
+msgstr "käyttäjä"
 
 #. DESC_ADD_BATCH
 msgid "Add selection for batch scan"
-msgstr "Auswahl zur Stapelliste hinzufügen"
+msgstr ""
 
 #. DESC_PIPETTE_WHITE
 msgid "Pick white point"
-msgstr "Wähle weißen Punkt"
+msgstr "Valitse valkoinen piste"
 
 #. DESC_PIPETTE_GRAY
 msgid "Pick gray point"
-msgstr "Wähle grauen Punkt"
+msgstr "Valitse harmaa piste"
 
 #. DESC_PIPETTE_BLACK
 msgid "Pick black point"
-msgstr "Wähle schwarzen Punkt"
+msgstr "Valitse musta piste"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
-msgstr "Zoomt auf kompletten Scanbereich"
+#, fuzzy
+msgid "Use full scan area"
+msgstr "Käytä koko skannausaluetta"
 
 #. DESC_ZOOM_OUT
 #, no-c-format
 msgid "Zoom 20% out"
-msgstr "Zoomt um 20% heraus"
+msgstr "Loitonna 20%"
 
 #. DESC_ZOOM_IN
 msgid "Click at position to zoom to"
-msgstr "In gewünschten Bereich zum Zoomen klicken"
+msgstr "Napsauta suurennettavaa kohtaa"
 
 #. DESC_ZOOM_AREA
 msgid "Zoom into selected area"
-msgstr "Zoomt in den gewählten Bereich hinein"
+msgstr "Suurenna valittu alue"
 
 #. DESC_ZOOM_UNDO
 msgid "Undo last zoom"
-msgstr "letzten Zoom rückgängig machen"
+msgstr "Kumoa edellinen suurennos"
 
 #. DESC_FULL_PREVIEW_AREA
 msgid "Select visible area"
-msgstr "Sichtbaren Bereich auswählen"
+msgstr "Valitse näkyvä alue"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
-msgstr "Scanbereich automatisch wählen"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
+msgstr "Valitse skannausalue automaattisesti"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
-msgstr "Scanbereich automatisch aufziehen"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
+msgstr "Valitse skannausalue automaattisesti"
 
 #. DESC_DELETE_IMAGES
 msgid "Delete preview image cache"
-msgstr "Vorschau Speicher löschen"
+msgstr "Poista esikatseluvälimuisti"
 
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
-"Bereichsvoreinstellung:\n"
-"Um einen neuen Bereich hinzuzufügen oder existierende Voreinstellungen zu "
-"ändern verwenden Sie das Kontextmenü (rechter Mausknopf)."
 
 #. DESC_ROTATION
 msgid "Rotate preview and scan"
-msgstr "Drehe Vorschau und Scan"
+msgstr "Käännä esikatselua ja skannaa"
 
 #. DESC_RATIO
 msgid "Aspect ratio of selection"
-msgstr "Seitenverhältnis der Auswahl"
+msgstr "Valinnan kuvasuhde"
 
 #. DESC_PAPER_ORIENTATION
 msgid "Define image position for printing"
-msgstr "Bildposition beim Drucken definieren"
+msgstr "Määritä kuvan sijainti tulostusta varten"
 
 #. DESC_VIEWER_OCR
 msgid "Optical Character Recognition"
-msgstr "Optische Zeichenerkennung (OCR)"
+msgstr "Optinen merkkientunnistus (OCR)"
 
 #. DESC_VIEWER_UNDO
 msgid "Undo last change"
-msgstr "Letzte Änderung rückgängig machen"
+msgstr "Kumoa edellinen muutos"
 
 #. DESC_VIEWER_CLONE
 msgid "Clone image"
-msgstr "Bild clonen"
+msgstr "Kloonaa kuva"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
-msgstr "Drehe Bild um 90 Grad"
+#, fuzzy
+msgid "Rotate image 90 degrees"
+msgstr "Kierrä kuvaa 90 astetta"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
-msgstr "Drehe Bild um 180 Grad"
+#, fuzzy
+msgid "Rotate image 180 degrees"
+msgstr "Kierrä kuvaa 180 astetta"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
-msgstr "Drehe Bild um 270 Grad"
+#, fuzzy
+msgid "Rotate image 270 degrees"
+msgstr "Kierrä kuvaa 270 astetta"
 
 #. DESC_MIRROR_X
 msgid "Mirror image at vertical axis"
-msgstr "Bild an vertikaler Achse spiegeln"
+msgstr "Peilaa kuva pystyakselin suhteen"
 
 #. DESC_MIRROR_Y
 msgid "Mirror image at horizontal axis"
-msgstr "Bild an horizontaler Achse spiegeln"
+msgstr "Peilaa kuva vaaka-akselin suhteen"
 
 #. DESC_VIEWER_ZOOM
 msgid "Zoom image"
-msgstr "Bild zoomen"
+msgstr "Suurenna kuvaa"
 
 #. DESC_STORE_MEDIUM
 msgid "Store medium"
-msgstr "Medium speichern"
+msgstr "Tallennusmedia"
 
 #. DESC_DELETE_MEDIUM
 msgid "Delete active medium"
-msgstr "Medium löschen"
+msgstr "Poista aktiivinen media"
 
 #. DESC_SCALE_FACTOR
 msgid "Scale factor"
-msgstr "Vergrößerungsfaktor"
+msgstr "Skaalauskerroin"
 
 #. DESC_X_SCALE_FACTOR
 msgid "X-Scale factor"
-msgstr "Vergrößerungsfaktor X"
+msgstr "Vaakaskaalauskerroin"
 
 #. DESC_Y_SCALE_FACTOR
 msgid "Y-Scale factor"
-msgstr "Vergrößerungsfaktor Y"
+msgstr "Pystyskaalauskerroin"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
-msgstr "Bild auf Breite [in Pixeln] skalieren"
+#, fuzzy
+msgid "Scale image to width [pixels]"
+msgstr "Skaalaa kuva leveyteen [pikseleissä]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
-msgstr "Bild auf Höhe [in Pixeln] skalieren"
+#, fuzzy
+msgid "Scale image to height [pixels]"
+msgstr "Skaalaa kuva korkeuteen [pikseleissä]"
 
 #. DESC_BATCH_LIST_EMPTY
 msgid "Empty batch list"
-msgstr "Stapelliste leeren"
+msgstr "Tyhjennä työjonolista"
 
 #. DESC_BATCH_LIST_SAVE
 msgid "Save batch list"
-msgstr "Stapelliste speichern"
+msgstr "Tallenna työjonolista"
 
 #. DESC_BATCH_LIST_LOAD
 msgid "Load batch list"
-msgstr "Stapelliste laden"
+msgstr "Avaa työjonolista"
 
 #. DESC_BATCH_RENAME
 msgid "Rename area"
-msgstr "Bereich umbenennen"
+msgstr "Nimeä alue uudelleen"
 
 #. DESC_BATCH_ADD
 msgid "Add selected preview area to batch list"
-msgstr "Vorschau-Auswahl zur Stapelliste hinzufügen"
+msgstr ""
 
 #. DESC_BATCH_DEL
 msgid "Delete selected area from batch list"
-msgstr "Ausgewählten Bereich aus Stapelliste löschen"
+msgstr ""
 
 #. DESC_AUTOMATIC
 msgid "Turns on automatic mode"
-msgstr "Schaltet automatische Einstellung ein"
+msgstr "Asettaa automaattisen tilan päälle"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_COLOR_ICM_PROFILE_BROWSE
 msgid "Browse for scanner default color ICM-profile"
-msgstr "Suche nach standard Scanner Farb-ICM-Profil"
+msgstr ""
 
 #. DESC_BUTTON_SCANNER_DEFAULT_GRAY_ICM_PROFILE_BROWSE
 msgid "Browse for scanner default gray ICM-profile"
-msgstr "Suche nach standard Scanner Graustufen-ICM-Profil"
+msgstr ""
 
 #. DESC_BUTTON_DISPLAY_ICM_PROFILE_BROWSE
 msgid "Browse for display ICM-profile"
-msgstr "Suche nach Bildschirm ICM-Profil"
+msgstr ""
 
 #. DESC_BUTTON_PRINTER_ICM_PROFILE_BROWSE
 msgid "Browse for printer ICM-profile"
-msgstr "Suche nach Durcker ICM-Profil"
+msgstr ""
 
 #. DESC_BUTTON_CUSTOM_PROOFING_ICM_PROFILE_BROWSE
 msgid "Browse for custom proofing ICM-profile"
-msgstr "Suche nach Benutzerdefiniertem Proofing ICM-Profil"
+msgstr ""
 
 #. DESC_BUTTON_WORKING_COLOR_SPACE_ICM_PROFILE_BROWSE
 msgid "Browse for working color space ICM-profile"
-msgstr "Suche nach ICM-Profil für den Arbeitsfarbraum"
+msgstr ""
 
 #. ERR_HOME_DIR
 msgid "Failed to determine home directory:"
-msgstr "Konnte Heimatverzeichnis nicht bestimmen"
+msgstr "Kotihakemiston määritys epäonnistui:"
 
 #. ERR_CHANGE_WORKING_DIR
 msgid "Failed to change working directory to"
-msgstr "Konnte Verzeichnis nicht wechseln"
+msgstr "Ei onnistuttu vaihtamaan työhakemistoksi"
 
 #. ERR_FILENAME_TOO_LONG
 msgid "Filename too long"
-msgstr "Dateiname zu lang"
+msgstr "Liian pitkä tiedostonimi"
 
 #. ERR_CREATE_TEMP_FILE
 msgid ""
@@ -2516,337 +2510,339 @@ msgid ""
 "select a temporary directory where you have\n"
 "write permissions."
 msgstr ""
-"Konnte temporäre Datei nicht erzeugen.\n"
-"Wählen Sie unter Menü Einstellungen->Konfiguration\n"
-"Bereich Speichern ein temporäres Verzeichnis aus,\n"
-"in dem Sie Schreibrechte besitzen."
 
 #. ERR_SET_OPTION
 msgid "Failed to set value of option"
-msgstr "Fehler beim Ändern der Option"
+msgstr "Valitsimen arvon asettaminen epäonnistui"
 
 #. ERR_GET_OPTION
 msgid "Failed to obtain value of option"
-msgstr "Fehler beim Lesen der Option"
+msgstr "Valitsimen arvon selvittäminen epäonnistui"
 
 #. ERR_OPTION_COUNT
 msgid "Error obtaining option count"
-msgstr "Konnte Anzahl der Optionen nicht bestimmen"
+msgstr "Valitsinten määrän selvittäminen epäonnistui"
 
 #. ERR_DEVICE_OPEN_FAILED
 msgid "Failed to open device"
-msgstr "Fehler beim Öffnen des Geräts"
+msgstr "Laitteen avaaminen epäonnistui"
 
 #. ERR_NO_DEVICES
 msgid "no devices available"
-msgstr "Keine Geräte erreichbar"
+msgstr "ei laitteita saatavilla"
 
 #. ERR_DURING_READ
 msgid "Error during read:"
-msgstr "Fehler beim Lesen:"
+msgstr "Virhe luettaessa:"
 
 #. ERR_DURING_SAVE
 msgid "Error during save:"
-msgstr "Fehler beim Speichern:"
+msgstr "Virhe tallennettaessa:"
 
 #. ERR_BAD_DEPTH
 msgid "Can't handle depth"
-msgstr "Nicht unterstützte Bittiefe"
+msgstr "Epäkelpo värisyvyys"
 
 #. ERR_UNKNOWN_SAVING_FORMAT
 msgid "Unknown file format for saving"
-msgstr "Unbekanntes Ausgabedateiformat"
+msgstr "Tuntematon tallennusmuoto"
 
 #. ERR_OPEN_FAILED
 msgid "Failed to open"
-msgstr "Fehler beim Öffnen von"
+msgstr "Avaaminen epäonnistui"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
-msgstr ""
-"Konnte keine sichere Datei erzeugen (möglicherweise existiert ein Link):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
+msgstr "Ei onnistuttu luomaan turvallista tiedostoa (ehkä linkkiä ei ole):"
 
 #. ERR_FAILED_PRINTER_PIPE
 msgid "Failed to open pipe for executing printercommand"
-msgstr "Konnte Pipe für Druckbefehl nicht öffnen"
+msgstr "Putken avaaminen tulostinkomennon suorittamista varten epäonnistui"
 
 #. ERR_FAILED_EXEC_PRINTER_CMD
 msgid "Failed to execute printercommand:"
-msgstr "Konnte Druckbefehl nicht ausführen"
+msgstr "Tulostinkomennon suorittaminen epäonnistui:"
 
 #. ERR_FAILED_START_SCANNER
 msgid "Failed to start scanner:"
-msgstr "Konnte Scanner nicht starten"
+msgstr "Skannerin käynnistäminen epäonnistui:"
 
 #. ERR_FAILED_GET_PARAMS
 msgid "Failed to get parameters:"
-msgstr "Konnte Parameter nicht lesen"
+msgstr "Ei onnistuttu hakemaan parametreja:"
 
 #. ERR_NO_OUTPUT_FORMAT
 msgid "No output format given"
-msgstr "Kein Ausgabedateiformat angegeben"
+msgstr "Tulostemuotoa ei annettu"
 
 #. ERR_NO_MEM
 msgid "out of memory"
-msgstr "Kein Speicher"
+msgstr "muisti loppui"
 
 #. ERR_TOO_MUCH_DATA
 msgid "Backend sends more image data than it defined in parameters"
-msgstr "Backend sendet mehr Bilddaten als es in Parametern definiert hat"
+msgstr "Taustaosa lähettää enemmän kuvadataa kuin se määritteli parametreissa"
 
 #. ERR_LIBTIFF
 msgid "LIBTIFF reports error"
-msgstr "LIBTIFF meldet Fehler"
+msgstr "LIBTIFF ilmoittaa virheestä"
 
 #. ERR_LIBPNG
 msgid "LIBPNG reports error"
-msgstr "LIBPNG meldet Fehler"
+msgstr "LIBPNG ilmoittaa virheestä"
 
 #. ERR_LIBJPEG
 msgid "LIBJPEG reports error"
-msgstr "LIBJPEG meldet Fehler"
+msgstr "LIBJPEG ilmoittaa virheestä"
 
 #. ERR_ZLIB
 msgid "ZLIB error or memory allocation problem"
-msgstr "ZLIB Fehler oder zu wenig Speicher"
+msgstr ""
 
 #. ERR_UNKNOWN_TYPE
 msgid "unknown type"
-msgstr "unbekannter Typ"
+msgstr "tuntematon tyyppi"
 
 #. ERR_UNKNOWN_CONSTRAINT_TYPE
 msgid "unknown constraint type"
-msgstr "unbekannter verpflichtender Typ"
+msgstr "tuntematon rajoitustyyppi"
 
 #. ERR_OPTION_NAME_NULL
 msgid "Option has empty name (NULL)."
-msgstr "Option hat leeren Namen (NULL)."
+msgstr "Asetuksella on tyhjä nimi (NULL)."
 
 #. ERR_BACKEND_BUG
 msgid "This is a backend bug. Please inform the author of the backend!"
-msgstr ""
-"Das ist ein Backend-Fehler. Bitte informieren Sie den Autor des Backends!"
+msgstr "Tämä on taustaosan virhe. Ilmoita siitä taustaosan tekijälle!"
 
 #. ERR_FAILED_EXEC_DOC_VIEWER
 msgid "Failed to execute documentation viewer:"
-msgstr "Konnte Hilfedateibetrachter nicht ausführen:"
+msgstr "Dokumentaatiokatselimen käynnistäminen epäonnistui:"
 
 #. ERR_FAILED_EXEC_FAX_VIEWER
 msgid "Failed to execute fax viewer:"
-msgstr "Konnte Faxbetrachter nicht ausführen:"
+msgstr "Faksikatselimen käynnistäminen epäonnistui:"
 
 #. ERR_FAILED_EXEC_FAX_CMD
 msgid "Failed to execute fax command:"
-msgstr "Konnte Faxbefehl nicht ausführen:"
+msgstr "Faksikomennon suorittaminen epäonnistui:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Konnte OCR-Befehl nicht ausführen:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Faksikomennon suorittaminen epäonnistui:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
-msgstr "unerwartetes FRAME-Format"
+msgstr "epäkelpo kehysmuoto"
 
 #. ERR_FAILED_SET_RESOLUTION
 msgid "unable to set resolution"
-msgstr "konnte Auflösung nicht definieren"
+msgstr "tarkkuuden asetus epäonnistui"
 
 #. ERR_PASSWORD_FILE_INSECURE
 #, c-format
 msgid "Password file (%s) is insecure, use permission x00\n"
-msgstr "Passwortdatei (%s) ist unsicher, benutze Rechte x00\n"
+msgstr "Salasanatiedosto (%s) ei ole turvattu, käytä oikeuksia x00\n"
 
 #. ERR_ERROR
 msgid "error"
-msgstr "Fehler"
+msgstr "virhe"
 
 #. ERR_MAJOR_VERSION_NR_CONFLICT
 msgid "Sane major version number mismatch!"
-msgstr "Sane Hauptversionsnummern-Konflikt!"
+msgstr "Sanen versionumero ei täsmää!"
 
 #. ERR_XSANE_MAJOR_VERSION
 msgid "XSane major version ="
-msgstr "XSane Hauptversionsnummer ="
+msgstr "XSane-versio ="
 
 #. ERR_BACKEND_MAJOR_VERSION
 msgid "backend major version ="
-msgstr "backend Hauptversionsnummer ="
+msgstr "taustaosan versio ="
 
 #. ERR_PROGRAM_ABORTED
 msgid "*** PROGRAM ABORTED ***"
-msgstr "*** PROGRAMM ABGEBROCHEN ***"
+msgstr "*** OHJELMA KESKEYTETTIIN ***"
 
 #. ERR_FAILED_ALLOCATE_IMAGE
 msgid "Failed to allocate image memory:"
-msgstr "Konnte Bildspeicher nicht allozieren:"
+msgstr "Virhe varattaessa muistia kuville:"
 
 #. ERR_PREVIEW_BAD_DEPTH
 msgid "Preview cannot handle bit depth"
-msgstr "Vorschau kann Bittiefe nicht handhaben:"
+msgstr "Esikatselu ei pysty käsittelemään tätä värisyvyyttä"
 
 #. ERR_GIMP_SUPPORT_MISSING
 msgid "GIMP support missing"
-msgstr "GIMP Unterstützung fehlt"
+msgstr "GIMP-tuki puuttuu"
 
 #. ERR_CREATE_FAX_PROJECT
 msgid "Could not create faxproject"
-msgstr "Konnte Faxprojekt nicht erstellen"
+msgstr "Ei voitu luoda faksiprojektia"
 
 #. WARN_COUNTER_UNDERRUN
 msgid "Filename counter underrun"
-msgstr "Dateinamenzähler Unterlauf"
+msgstr "Virhe tiedostonimilaskurissa"
 
 #. WARN_NO_VALUE_CONSTRAINT
 msgid "warning: option has no value constraint"
-msgstr "Warnung: Option hat keinen vorgeschriebenen Wert"
+msgstr "varoitus: valitsimella ei ole arvorajoitusta"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
-"Sie versuchen XSane als ROOT auszuführen,\n"
-"das ist wirklich GEFÄHRLICH!\n"
+"Olet ajamassa XSanea PÄÄKÄYTTÄJÄNÄ, se on erittäin VAARALLISTA!\n"
 "\n"
-"Senden Sie keine Fehlermeldungen wenn Sie Probleme\n"
-"haben während Sie xsane als root ausführen:\n"
-"Sie sind alleine!"
+"Älä lähetä virheilmoituksia kun sinulla\n"
+"on ongelmia ajaessa XSanea pääkäyttäjänä:\n"
+"OLET YKSIN!"
 
 #. ERR_HEADER_ERROR
 msgid "Error"
-msgstr "Fehler"
+msgstr "Virhe"
 
 #. ERR_HEADER_WARNING
 msgid "Warning"
-msgstr "Warnung"
+msgstr "Varoitus"
 
 #. ERR_HEADER_INFO
 msgid "Information"
-msgstr "Information"
+msgstr "Tietoja"
 
 #. ERR_HEADER_CHILD_PROCESS_ERROR
 msgid "Child process error"
-msgstr "Kindprozess-Fehler"
+msgstr "Virhe lapsiprosessissa"
 
 #. ERR_FAILED_CREATE_FILE
 msgid "Failed to create file:"
-msgstr "Fehler beim Erstellen der Datei:"
+msgstr "Tiedoston luominen epäonnistui:"
 
 #. ERR_LOAD_DEVICE_SETTINGS
 msgid "Error while loading device settings:"
-msgstr "Fehler beim Laden der Geräteeinstellungen"
+msgstr "Virhe ladattaessa laitteen asetuksia:"
 
 #. ERR_NO_DRC_FILE
 msgid "is not a device-rc-file !!!"
-msgstr "ist keine Geräteeinstellungs-Datei !!!"
+msgstr "ei ole DRC-tiedosto!"
 
 #. ERR_NETSCAPE_EXECUTE_FAIL
 msgid "Failed to execute netscape!"
-msgstr "Konnte Netscape nicht aufrufen"
+msgstr "Netscapen suorittaminen epäonnistui!"
 
 #. ERR_SENDFAX_RECEIVER_MISSING
 msgid "Send fax: no receiver defined"
-msgstr "Fax senden: kein Empfänger angegeben"
+msgstr "Lähetä faksi: vastaanottajaa ei määritelty"
 
 #. ERR_CREATED_FOR_DEVICE
 msgid "has been created for device"
-msgstr "wurde erstellt für das Gerät"
+msgstr "on luotu laitteelle"
 
 #. ERR_USED_FOR_DEVICE
 msgid "you want to use it for device"
-msgstr "wird benutzt für das Gerät"
+msgstr "haluat käyttää sitä laitteelle"
 
 #. ERR_MAY_CAUSE_PROBLEMS
 msgid "this may cause problems!"
-msgstr "das kann zu Problemen führen!"
+msgstr "tämä saattaa aiheuttaa ongelmia!"
 
 #. WARN_UNSAVED_IMAGES
 #, c-format
 msgid "There are %d unsaved images"
-msgstr "Es gibt %d nicht gespeicherte Bilder"
+msgstr "%d tallentamatonta kuvaa"
 
 #. WARN_FILE_EXISTS
 #, c-format
 msgid "File %s already exists"
-msgstr "Datei %s existiert bereits"
+msgstr "Tiedosto %s on jo olemassa"
 
 #. ERR_FILE_NOT_EXISTS
 #, c-format
 msgid "File %s does not exist"
-msgstr "Datei %s existiert nicht"
+msgstr "Tiedostoa %s ei ole"
 
 #. ERR_FILE_NOT_POSTSCRIPT
 #, c-format
 msgid "File %s is not a postscript file"
-msgstr "Datei %s is keine Postscript-Datei"
+msgstr "Tiedosto %s ei ole postscript-tiedosto"
 
 #. ERR_UNSUPPORTED_OUTPUT_FORMAT
 #, c-format
 msgid "Unsupported %d-bit output format: %s"
-msgstr "Nicht unterstütztes %d-bit Ausgabeformat: %s"
+msgstr "Ei-tuettu %d-bittinen tulostemuoto: %s"
 
 #. ERR_CMS_CONVERSION
+#, fuzzy
 msgid "Error during CMS conversion:"
-msgstr "Fehler bei Farbkonvertierung:"
+msgstr "Virhe tallennettaessa:"
 
 #. ERR_CMS_OPEN_ICM_FILE
+#, fuzzy
 msgid "Could not open"
-msgstr "Fehler beim Öffnen von"
+msgstr "Avaaminen epäonnistui"
 
 #. CMS_SCANNER_ICM
 msgid "scanner ICM profile"
-msgstr "Scanner ICM-Profil"
+msgstr ""
 
 #. CMS_DISPLAY_ICM
 msgid "display ICM profile"
-msgstr "Bildschirm ICM-Profil"
+msgstr ""
 
 #. CMS_PROOF_ICM
 msgid "proofing ICM profile"
-msgstr "Proofing ICM-Profil"
+msgstr ""
 
 #. ERR_CMS_CREATE_TRANSFORM
+#, fuzzy
 msgid "Could not create transform"
-msgstr "Konnte Transformation nicht erstellen"
+msgstr "Ei voitu luoda faksiprojektia"
 
 #. WARN_VIEWER_IMAGE_NOT_SAVED
 msgid "viewer image is not saved"
-msgstr "Betrachter-Bild ist nicht gespeichert"
+msgstr "katselimen kuvaa ei tallennettu"
 
 #. FILE_FILTER_ALL_FILES
 msgid "All files"
-msgstr "Alle Dateien"
+msgstr ""
 
 #. FILE_FILTER_IMAGES
 msgid "Images"
-msgstr "Bilder"
+msgstr ""
 
 #. FILE_FILTER_XBL
+#, fuzzy
 msgid "XSane batch list"
-msgstr "Stapellisten"
+msgstr "Tallenna työjonolista"
 
 #. FILE_FILTER_ICM
 msgid "ICC/ICM Profiles"
-msgstr "ICC/ICM Profile"
+msgstr ""
 
 #. FILE_FILTER_DRC
+#, fuzzy
 msgid "XSane device preferences"
-msgstr "Geräteeinstellungen"
+msgstr "Tallenna laiteasetukset poistuttaessa"
 
 #. FILE_FILTER_RC
+#, fuzzy
 msgid "XSane preferences"
-msgstr "Einstellungen"
+msgstr "Asetukset"
 
 #. TEXT_USAGE
 msgid "Usage:"
-msgstr "Gebrauch:"
+msgstr "Käyttö:"
 
 #. TEXT_USAGE_OPTIONS
 msgid "[OPTION]... [DEVICE]"
-msgstr "[OPTION]... [GERÄT]"
+msgstr "[VALITSIN]... [LAITE]"
 
 #. TEXT_HELP
 msgid ""
@@ -2884,66 +2880,39 @@ msgid ""
 " --sync                       request a synchronous connection with the X11 "
 "server"
 msgstr ""
-"Startet graphisches Benutzerinterface für SANE (Scanner Access Now Easy)\n"
-"\n"
-"Das Format von [GERÄT] ist Backendname:Gerätedatei (z.B. umax:/dev/scanner)\n"
-"[OPTION]... kann eine Kombination aus den folgenden Elementen sein:\n"
-" -h, --help                   zeigt diesen Hilfetext\n"
-" -v, --version                gibt Versionsinformationen aus\n"
-" -l, --license                gibt Lizenzinformationen aus\n"
-"\n"
-" -d, --device-settings datei  lädt Geräteeinstellungen von datei\n"
-"\n"
-" -V, --viewer                 starte im Betrachtermodus (default)\n"
-" -s, --save                   starte im Speichernmodus\n"
-" -c, --copy                   starte im Kopiermodus\n"
-" -m, --multipage              starte im Mehrseitenmodus\n"
-" -f, --fax                    starte im Faxmodus\n"
-" -e, --email                  starte im E-Mailmodus\n"
-" -n, --no-mode-selection      deaktiviere Modusauswahl\n"
-"\n"
-" -F, --Fixed                  Hauptfenstergröße ist fest\n"
-" -R, --Resizeable             Hauptfenstergröße ist veränderbar\n"
-"\n"
-" -p, --print-filenames        gibt Dateinamen erzeugter Bilder aus\n"
-" -N, --force-filename name    benutze name als Dateinamen,\n"
-"                              deaktiviere Auswahl für Dateinamen\n"
-"\n"
-" --display X11-display        lenkt X-Ausgabe auf X11-Display um\n"
-" --no-xshm                    keine shared memory Bilder benutzen\n"
-" --sync                       fordert synchrone Verbindung zum X-Server an"
 
 #. strings for gimp plugin
 #. XSANE_GIMP_INSTALL_BLURB
 msgid "Front-end to the SANE interface"
-msgstr "Frontend zum SANE-Interface"
+msgstr "Edustaosa SANE-rajapinnalle"
 
 #. XSANE_GIMP_INSTALL_HELP
 msgid ""
 "This function provides access to scanners and other image acquisition "
 "devices through the SANE (Scanner Access Now Easy) interface."
 msgstr ""
-"Diese Funktion gibt Zugang zu Scannern und anderen bilderzeugenden Geräten "
-"durch das SANE (Scanner Access Now Easy) Interface"
+"Tämä toiminto tarjoaa pääsyn kuvanlukijoihin ja muihin kuvalaitteisiin SANE-"
+"rajapinnan (Scanner Access Now Easy) avulla."
 
 #. Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/"
 #. XSANE_GIMP_MENU_DIALOG
 msgid "<Toolbox>/File/Acquire/XSane: Device dialog..."
-msgstr "<Toolbox>/File/Acquire/XSane: Geräteauswahl"
+msgstr "<Toolbox>/Tiedosto/Kuvan syöttö/XSane: Laiteikkuna..."
 
 #. XSANE_GIMP_MENU
 msgid "<Toolbox>/File/Acquire/XSane: "
-msgstr "<Toolbox>/File/Acquire/XSane: "
+msgstr "<Toolbox>/Tiedosto/Kuvan syöttö/Xsane: "
 
 #. XSANE_GIMP_MENU_DIALOG_OLD
 msgid "<Toolbox>/Xtns/XSane/Device dialog..."
-msgstr "<Toolbox>/Xtns/XSane/Geräteauswahl"
+msgstr "<Toolbox>/Laajennokset/XSane/Laiteikkuna..."
 
 #. XSANE_GIMP_MENU_OLD
 msgid "<Toolbox>/Xtns/XSane/"
-msgstr "<Toolbox>/Xtns/XSane/"
+msgstr "<Toolbox>/Laajennokset/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -2951,91 +2920,90 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
-"Mögliche Gründe:\n"
-"1) Es ist wirklich kein von SANE unterstützes Gerät vorhanden\n"
-"2) Unterstützte Geräte sind belegt\n"
-"3) Die Rechte für die Gerätedatei erlauben Ihnen keinen Zugriff - Versuchen "
-"Sie es als root\n"
-"4) Das Backend wurde von SANE nicht geladen (man sane-dll)\n"
-"5) Das Backend wurde nicht richtig konfiguriert (man sane-\"backendname\")\n"
-"6) Möglicherweise sind mehrere SANE Versionen installiert"
+"Mahdolliset syyt:\n"
+"1) Järjestelmässä ei ole SANEn tukemaa laitetta\n"
+"2) Tuetut laitteet ovat varattuja\n"
+"3) Laitteen oikeudet eivät salli sinun käyttää sitä - kokeile pääkäyttäjänä\n"
+"4) SANE ei ole ladannut taustaosaa (man sane-dll)\n"
+"5) Taustaosan asetukset eivät ole kunnossa (man sane-\"taustaosannimi\")\n"
+"6) SANEsta on mahdollisesti asennettuna useampia versioita"
 
 #. strings that are used in structures, so it is not allowed to use _()/gettext() here
 #. gettext_noop does mark these texts but does not change the string
 #. MENU_ITEM_SURFACE_FULL_SIZE
 msgid "full size"
-msgstr "volle Größe"
+msgstr "täysi koko"
 
 #. MENU_ITEM_SURFACE_DIN_A3P
 msgid "DIN A3 port."
-msgstr "DIN A3 hoch"
+msgstr "DIN A3 pysty"
 
 #. MENU_ITEM_SURFACE_DIN_A3L
 msgid "DIN A3 land."
-msgstr "DIN A3 quer"
+msgstr "DIN A3 vaaka"
 
 #. MENU_ITEM_SURFACE_DIN_A4P
 msgid "DIN A4 port."
-msgstr "DIN A4 hoch"
+msgstr "DIN A4 pysty"
 
 #. MENU_ITEM_SURFACE_DIN_A4L
 msgid "DIN A4 land."
-msgstr "DIN A4 quer"
+msgstr "DIN A4 vaaka"
 
 #. MENU_ITEM_SURFACE_DIN_A5P
 msgid "DIN A5 port."
-msgstr "DIN A5 hoch"
+msgstr "DIN A5 pysty"
 
 #. MENU_ITEM_SURFACE_DIN_A5L
 msgid "DIN A5 land."
-msgstr "DIN A5 quer"
+msgstr "DIN A5 vaaka"
 
 #. MENU_ITEM_SURFACE_13cmx18cm
 msgid "13cm x 18cm"
-msgstr "13cm x 18cm"
+msgstr "13 cm x 18 cm"
 
 #. MENU_ITEM_SURFACE_18cmx13cm
 msgid "18cm x 13cm"
-msgstr "18cm x 13cm"
+msgstr "18 cm x 13 cm"
 
 #. MENU_ITEM_SURFACE_10cmx15cm
 msgid "10cm x 15cm"
-msgstr "10cm x 15cm"
+msgstr "10 cm x 15 cm"
 
 #. MENU_ITEM_SURFACE_15cmx10cm
 msgid "15cm x 10cm"
-msgstr "15cm x 10cm"
+msgstr "15 cm x 10 cm"
 
 #. MENU_ITEM_SURFACE_9cmx13cm
 msgid "9cm x 13cm"
-msgstr "9cm x 13cm"
+msgstr "9 cm x 13 cm"
 
 #. MENU_ITEM_SURFACE_13cmx9cm
 msgid "13cm x 9cm"
-msgstr "13cm x 9cm"
+msgstr "13 cm x 9 cm"
 
 #. MENU_ITEM_SURFACE_legal_P
 msgid "legal port."
-msgstr "legal hoch"
+msgstr "legal pysty"
 
 #. MENU_ITEM_SURFACE_legal_L
 msgid "legal land."
-msgstr "legal quer"
+msgstr "legal vaaka"
 
 #. MENU_ITEM_SURFACE_letter_P
 msgid "letter port."
-msgstr "letter hoch"
+msgstr "letter pysty"
 
 #. MENU_ITEM_SURFACE_letter_L
 msgid "letter land."
-msgstr "letter quer"
+msgstr "letter vaaka"
 
 #. MENU_ITEM_MEDIUM_FULL_COLOR_RANGE
 msgid "Full color range"
-msgstr "Voller Farbumfang"
+msgstr "Täysi värivalikoima"
 
 #. MENU_ITEM_MEDIUM_SLIDE
 msgid "Slide"
@@ -3043,167 +3011,195 @@ msgstr "Dia"
 
 #. MENU_ITEM_MEDIUM_STANDARD_NEG
 msgid "Standard negative"
-msgstr "Standard Negativ"
+msgstr "Tavallinen negatiivi"
 
 #. MENU_ITEM_MEDIUM_AGFA_NEG
 msgid "Agfa negative"
-msgstr "Agfa Negativ"
+msgstr "Agfa-negatiivi"
 
 #. MENU_ITEM_MEDIUM_AGFA_NEG_XRG200_4
 msgid "Agfa negative XRG 200-4"
-msgstr "Agfa Negativ XRG 200-4"
+msgstr "Agfa-negatiivi XRG 200-4"
 
 #. MENU_ITEM_MEDIUM_AGFA_NEG_HDC_100
 msgid "Agfa negative HDC 100"
-msgstr "Agfa Negativ HDC 100"
+msgstr "Agfa-negatiivi HDC 100"
 
 #. MENU_ITEM_MEDIUM_FUJI_NEG
 msgid "Fuji negative"
-msgstr "Fuji Negativ"
+msgstr "Fuji-negatiivi"
 
 #. MENU_ITEM_MEDIUM_KODAK_NEG
 msgid "Kodak negative"
-msgstr "Kodak Negativ"
+msgstr "Kodak-negatiivi"
 
 #. MENU_ITEM_MEDIUM_KONICA_NEG
 msgid "Konica negative"
-msgstr "Konica Negativ"
+msgstr "Konica-negatiivi"
 
 #. MENU_ITEM_MEDIUM_KONICA_NEG_VX_100
 msgid "Konica negative VX 100"
-msgstr "Konica Negativ VX 100"
+msgstr "Konica-negatiivi VX 100"
 
 #. MENU_ITEM_MEDIUM_ROSSMANN_NEG_HR_100
 msgid "Rossmann negative HR 100"
-msgstr "Rossmann Negativ HR 100"
+msgstr "Rossmann-negatiivi HR 100"
 
 #. TEXT_PROJECT_STATUS_NOT_CREATED
 msgid "Project not created"
-msgstr "Projekt nicht erstellt"
+msgstr "Projektia ei luotu"
 
 #. TEXT_PROJECT_STATUS_CREATED
 msgid "Project created"
-msgstr "Projekt erstellt"
+msgstr "Projekti luotiin"
 
 #. TEXT_PROJECT_STATUS_CHANGED
 msgid "Project changed"
-msgstr "Projekt geändert"
+msgstr "Projektia muutettiin"
 
 #. TEXT_PROJECT_STATUS_ERR_READ_PROJECT
 msgid "Error reading project"
-msgstr "Fehler beim Lesen des Projekts"
+msgstr "Projektia luettaessa tapahtui virhe"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING_ERROR
 msgid "Error saving file"
-msgstr "Fehler beim Speichern"
+msgstr "Virhe tallennettaessa tiedostoa"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING
 msgid "Saving file"
-msgstr "Datei wird gespeichert"
+msgstr "Tallennetaan tiedostoa"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING_ABORTED
 msgid "Aborted saving file"
-msgstr "Datei speichern abgebrochen"
+msgstr "Tiedoston tallentaminen keskeytettiin"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVED
 msgid "File has been saved"
-msgstr "Datei wurde gespeichert"
+msgstr "Tiedosto tallennettiin"
 
 #. TEXT_EMAIL_STATUS_POP3_CONNECTION_FAILED
 msgid "POP3 connection failed"
-msgstr "POP3-Verbindung fehlgeschlagen"
+msgstr "POP3-yhteys epäonnistui"
 
 #. TEXT_EMAIL_STATUS_POP3_LOGIN_FAILED
 msgid "POP3 login failed"
-msgstr "POP3-Login fehlgeschlagen"
+msgstr "POP3-kirjautuminen epäonnistui"
 
 #. TEXT_EMAIL_STATUS_ASMTP_AUTH_FAILED
 msgid "ASMTP authentication failed"
-msgstr "ASMTP Authentifizierung fehlgeschlagen"
+msgstr ""
 
 #. TEXT_EMAIL_STATUS_SMTP_CONNECTION_FAILED
 msgid "SMTP connection failed"
-msgstr "SMTP Verbindung fehlgeschlagen"
+msgstr "SMTP-yhteys epäonnistui"
 
 #. TEXT_EMAIL_STATUS_SMTP_ERR_FROM
 msgid "From entry not accepted"
-msgstr "Absender Eintrag nicht akzeptiert"
+msgstr "Lähettäjää ei hyväksytty"
 
 #. TEXT_EMAIL_STATUS_SMTP_ERR_RCPT
 msgid "Receiver entry not accepted"
-msgstr "Empfänger Eintrag nicht akzeptiert"
+msgstr "Vastaanottajaa ei hyväksytty"
 
 #. TEXT_EMAIL_STATUS_SMTP_ERR_DATA
 msgid "E-mail data not accepted"
-msgstr "E-Mail Daten nicht akzeptiert"
+msgstr ""
 
 #. TEXT_EMAIL_STATUS_SENDING
 msgid "Sending e-mail"
-msgstr "E-Mail wird gesendet"
+msgstr ""
 
 #. TEXT_EMAIL_STATUS_SENT
 msgid "E-mail has been sent"
-msgstr "E-Mail wurde gesendet"
+msgstr ""
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
-msgstr "Fax zum Senden einreihen"
+#, fuzzy
+msgid "Queueing fax"
+msgstr "Laitetaan faksi jonoon"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
 msgid "Fax is queued"
-msgstr "Fax ist zum Senden eingereiht"
+msgstr "Faksi on jonossa"
 
 #. Sane backend messages
 msgid "flatbed scanner"
-msgstr "Flachbettscanner"
+msgstr "tasokuvanlukija"
 
 msgid "frame grabber"
-msgstr "Framegrabber"
+msgstr ""
 
 msgid "handheld scanner"
-msgstr "Handscanner"
+msgstr "käsikuvanlukija"
 
 msgid "still camera"
-msgstr "Fotokamera"
+msgstr "kamera"
 
 msgid "video camera"
-msgstr "Videokamera"
+msgstr "videokamera"
 
 msgid "virtual device"
-msgstr "virtuelles Gerät"
+msgstr "näennäislaite"
 
 msgid "Success"
-msgstr "Erfolg"
+msgstr "Onnistui"
 
 msgid "Operation not supported"
-msgstr "Operation nicht unterstützt"
+msgstr "Toimintoa ei tueta"
 
 msgid "Operation was cancelled"
-msgstr "Operation abgebrochen"
+msgstr "Toiminto peruttiin"
 
 msgid "Device busy"
-msgstr "Gerät besetzt"
+msgstr "Laite varattu"
 
 msgid "Invalid argument"
-msgstr "Ungültiges Argument"
+msgstr "Epäkelpo argumentti"
 
 msgid "End of file reached"
-msgstr "Dateiende erreicht"
+msgstr "Saavutettiin tiedoston loppu"
 
 msgid "Document feeder jammed"
-msgstr "Dokumenteneinzug blockiert"
+msgstr ""
 
 msgid "Document feeder out of documents"
-msgstr "Dokumenteneinzug ohne Papier"
+msgstr ""
 
 msgid "Scanner cover is open"
-msgstr "Scannerdeckel ist offen"
+msgstr "Kuvanlukijan kansi on auki"
 
 msgid "Error during device I/O"
-msgstr "Fehler während Geräte I/O"
+msgstr ""
 
 msgid "Out of memory"
-msgstr "Kein Speicher"
+msgstr "Muisti loppui"
 
 msgid "Access to resource has been denied"
-msgstr "Zugang zum Gerät wurde verweigert"
+msgstr "Pääsy resurssiin on estetty"
+
+#~ msgid "XSane options"
+#~ msgstr "XSane-valinnat"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Tulostimen gamma-arvo:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Tulostimen vihergamma:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Tulostimen sinigamma:"
+
+#~ msgid "execute"
+#~ msgstr "suoritus"
+
+#~ msgid "GIMP can't handle depth %d bits/color"
+#~ msgstr "GIMP ei pysty käsittelemään %d bittiä värille"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "OCR-komennon suorittaminen epäonnistui:"
+
+#~ msgid "XSane Image Scanner"
+#~ msgstr "XSane-kuvanlukuohjelma"
+
+#~ msgid "Scan, copy and fax images"
+#~ msgstr "Skannaa, kopioi ja faksaa kuvia"
diff --git a/po/fr.gmo b/po/fr.gmo
index b0e9f2a..d61912d 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index e041d59..5064800 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2000-02-09 21:00+01:00\n"
 "Last-Translator: Laurent Grawet <laurent.grawet@ibelgique.com>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -83,7 +83,8 @@ msgid "rename fax page"
 msgstr "Renommer la page de fax"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "Importer un fichier ps dans un fax"
 
 #. WINDOW_EMAIL_PROJECT
@@ -508,7 +509,7 @@ msgid "Skip existing filenames"
 msgstr "Sauter les noms de fichiers existants"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -516,7 +517,8 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Sauver l'image pnm 16 bit en format ascii"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -540,8 +542,9 @@ msgstr "Utiliser une palette de couleurs privée"
 msgid "Autoenhance gamma"
 msgstr "Correction gamma automatique"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Présélection de l'aire de numérisation"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -565,10 +568,6 @@ msgstr "Recherche de périphériques..."
 msgid "Available devices:"
 msgstr "Périphériques disponibles:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Options de XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Type"
@@ -900,53 +899,72 @@ msgstr "Commande:"
 msgid "Copy number option:"
 msgstr "Nombre de copies:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Change la résolution de numérisation"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Résolution en mode trait (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Résolution en mode niveaux de gris (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Résolution en mode couleur (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Largeur"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Longueur"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Marge gauche"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Marge inférieure"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Gamma rouge de l'imprimante:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Gamma de l'imprimante:"
+#, fuzzy
+msgid "common value"
+msgstr "Valeurs récentes:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Gamma rouge de l'imprimante:"
+#, fuzzy
+msgid "red"
+msgstr "lecture"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Gamma vert de l'imprimante:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Gamma bleu de l'imprimante:"
+#, fuzzy
+msgid "blue"
+msgstr "Flou"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -963,7 +981,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1087,8 +1105,24 @@ msgstr "Options par défaut pour:"
 msgid "Viewer (Postscript):"
 msgstr "Visionneuse (PostScript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Largeur"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Longueur"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Marge gauche"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Marge inférieure"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1460,11 +1494,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "Compression CCITT 1D Huffman"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "Compression CCITT Group 3 Fax"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "Compression CCITT Group 4 Fax"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1593,8 +1629,9 @@ msgstr "Réception des données %s..."
 msgid "page"
 msgstr "paquetage"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Transfert de l'image..."
 
 #. PROGRESS_ROTATING_DATA
@@ -1668,9 +1705,10 @@ msgstr ""
 "poster-<Ctrl-m>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2030,14 +2068,16 @@ msgid "Browse for temporary directory"
 msgstr "Parcourir pour un répertoire temporaire"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Qualité en pourcentage si l'image est enregistrée en jpeg ou tiff avec "
 "compression jpeg"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Compression si l'image est enregistrée en png"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2046,19 +2086,22 @@ msgstr "Longueur minimale du compteur de noms de fichiers"
 
 #. DESC_TIFF_ZIP_COMPRESSION
 #, fuzzy
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Type de compression si une image 8 bit est enregistrée en tiff"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Type de compression si une image 16 bit est enregistrée en tiff"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Type de compression si une image 8 bit est enregistrée en tiff"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Type de compression si l'image trait est enregistrée en tiff"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2089,10 +2132,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Quand une une image 16 bit doit être sauvée au format pnm, utilisez le "
@@ -2154,7 +2198,8 @@ msgid "Select how a range is displayed"
 msgstr "Sélectionnez la manière dont la plage est affichée"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr ""
 "Valeur avec laquelle la résolution de prévisualisation calculée est "
 "multipliée"
@@ -2225,8 +2270,9 @@ msgstr ""
 "fonction pipette"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Entrez la commande a exécuter pour afficher les fichiers d'aide ; doit être "
 "capable de lire du html !"
@@ -2235,8 +2281,9 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Change la valeur gamma quand le bouton d'optimisation auto est pressé"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr ""
 "Sélectionne l'aire de numérisation une fois la prévisualisation terminée"
 
@@ -2331,28 +2378,33 @@ msgstr "Port de connexion POP3"
 
 #. DESC_HTML_EMAIL
 #, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "Message envoyé en mode html, placer l'image avec: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Entrez la commande pour lancer le programme d'OCR"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Entrez l'option du programme d'OCR pour définir un fichier d'entrée"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Entrez l'option du programme d'OCR pour définir un fichier de sortie"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Définissez si le programme d'OCR supporte un pipe GUI de progression"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Entrez l'option du programme d'OCR pour définir un fichier descripteur de "
 "sortie en mode GUI"
@@ -2392,7 +2444,8 @@ msgid "Pick black point"
 msgstr "Choisissez un point noir"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Utilise l'aire de numérisation complète"
 
 #. DESC_ZOOM_OUT
@@ -2416,12 +2469,14 @@ msgstr "Annule le dernier zoom"
 msgid "Select visible area"
 msgstr "Sélectionne l'aire visible"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Sélection automatique de l'aire de numérisation"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Affichage automatique de l'aire de numérisation"
 
 #. DESC_DELETE_IMAGES
@@ -2429,9 +2484,10 @@ msgid "Delete preview image cache"
 msgstr "Effacer le cache de l'aperçu"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Aire de présélection: \n"
@@ -2463,15 +2519,18 @@ msgid "Clone image"
 msgstr "Cloner l'image"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Rotation à 90° de l'image"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Rotation à 180° de l'image"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Rotation à 270° de l'image"
 
 #. DESC_MIRROR_X
@@ -2507,11 +2566,13 @@ msgid "Y-Scale factor"
 msgstr "Facteur d'échelle vertical"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Mettre l'image à l'échelle de la largeur [en pixels]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Mettre l'image à l'échelle de la hauteur [en pixels]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2633,7 +2694,8 @@ msgid "Failed to open"
 msgstr "Echec de l'ouverture"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Ne peut créer un fichier sécurité (peut-être qu'un lien existe déja):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2710,8 +2772,9 @@ msgid "Failed to execute fax command:"
 msgstr "Erreur d'exécution de la commande de fax:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Erreur d'exécution de la commande OCR:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Erreur d'exécution de la commande de fax:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2772,11 +2835,12 @@ msgid "warning: option has no value constraint"
 msgstr "Attention: l'option n'a pas de restriction"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Vous exécutez XSane en tant que ROOT, c'est réellement DANGEREUX !\n"
@@ -3033,6 +3097,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr ""
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -3040,7 +3105,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Raisons possibles:\n"
@@ -3247,7 +3312,8 @@ msgid "E-mail has been sent"
 msgstr "Message envoyé"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Mise en queue du fax"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3309,6 +3375,24 @@ msgstr "Dépassement de mémoire"
 msgid "Access to resource has been denied"
 msgstr "Accès à la ressource refusé"
 
+#~ msgid "XSane options"
+#~ msgstr "Options de XSane"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Erreur d'exécution de la commande OCR:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Résolution en mode couleur (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Gamma de l'imprimante:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Gamma vert de l'imprimante:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Gamma bleu de l'imprimante:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Enlever une imprimante"
diff --git a/po/hu.gmo b/po/hu.gmo
index 3ff9b7b..6a726ac 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index bfacdf7..55262a6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2005-12-31 10:34+0100\n"
 "Last-Translator: Aron Novak <aaron@szentimre.hu>\n"
 "Language-Team: Hungarian\n"
@@ -84,7 +84,8 @@ msgid "rename fax page"
 msgstr "faxoldal átnevezése"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "ps fájl beszúrása a faxba"
 
 #. WINDOW_EMAIL_PROJECT
@@ -503,7 +504,8 @@ msgid "Skip existing filenames"
 msgstr "Létező fájlnevek kihagyása"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+#, fuzzy
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr "Mentés postscript zlib tömörítettben (ps level 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -511,7 +513,8 @@ msgid "Save PDF zlib compressed"
 msgstr "Mentés PDF-ben, zlibbel tömörítve"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Mentés 16bites pnm ascii módban"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -535,8 +538,9 @@ msgstr "Egyéni színtérkép használata"
 msgid "Autoenhance gamma"
 msgstr "A gamma önműködő javítása"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Előre választott beolvasási terület"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -560,10 +564,6 @@ msgstr "eszközök keresése"
 msgid "Available devices:"
 msgstr "Elérhető eszközök:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "XSane beállítások"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Típus"
@@ -885,53 +885,72 @@ msgstr "Parancs:"
 msgid "Copy number option:"
 msgstr "Másolatszám lehetősége:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Állítsd be a felbontást"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Vonalas felbontás (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Szürkeárnyalatos felbontás (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Színes felbontás (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Szélesség"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Magasság"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Jobb eltolás"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Lenti eltolás"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Nyomtató piros gammája:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Nyomtató gamma értéke:"
+#, fuzzy
+msgid "common value"
+msgstr "Jelenlegi értékek:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Nyomtató piros gammája:"
+#, fuzzy
+msgid "red"
+msgstr "olvasás"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Nyomtató zöld gammája:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Nyomtató kék gammája:"
+#, fuzzy
+msgid "blue"
+msgstr "Elmosás"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -948,7 +967,8 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr "Zlibbel tömörített postscript létrehozása nyomtatáshoz (ps level 3)"
 
 #. TEXT_SETUP_TMP_PATH
@@ -1071,8 +1091,25 @@ msgstr "Alapértelmezett beállítások ehhez:"
 msgid "Viewer (Postscript):"
 msgstr "Nézőke (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Szélesség"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Magasság"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Jobb eltolás"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Lenti eltolás"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr "Zlibbel tömörített postscript létrehozása faxhoz (ps level 3)"
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1439,11 +1476,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "CCITT 1D Huffman tömörítés"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "CCITT Group 3 Fax tömörítés"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "CCITT Group 4 Fax tömörítés"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1569,8 +1608,9 @@ msgstr "%s adatok fogadása"
 msgid "page"
 msgstr "oldal"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Kép átvitele"
 
 #. PROGRESS_ROTATING_DATA
@@ -1643,9 +1683,10 @@ msgstr ""
 "m>, fax-<Ctrl-f> vagy e-mail-<Ctrl-e>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2000,14 +2041,16 @@ msgid "Browse for temporary directory"
 msgstr "Tallózás az ideiglenes könyvtárhoz"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "A minőség százalékban megadva, ha a kép jpegben vagy jpeg tömörítésű tiffben "
 "van mentve"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "A tömörítés, ha a kép pngben van mentve"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2015,19 +2058,23 @@ msgid "Minimum length of counter in filename"
 msgstr "A fájlnévben a számláló minimális hossza"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+#, fuzzy
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Tömörítési szint zippel tömörített tiff-nél (deflate)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "A tömörítés módja 16 bites tiff kép esetén"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "A tömörítés módja 8 bites tiff kép esetén"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "A tömörítés módja vonalas tiff kép esetén"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2061,10 +2108,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr "PDF tömörítése zlibbel (flatdecode)"
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Amikor 16 bites pnm fájlt mentünk, akkor azt ascii formában mentse a bináris "
@@ -2116,7 +2164,8 @@ msgid "Select how a range is displayed"
 msgstr "Terület megjelenítésének beállítása"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Ezzel az értékkel szorzódik az előnézeti felbontás"
 
 #. DESC_PREVIEW_GAMMA
@@ -2180,8 +2229,9 @@ msgid "dimension of square that is used to average color for pipette function"
 msgstr "dimension of square that is used to average color for pipette function"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Adjuk meg a parancsot, ami a súgófájlok megjelenítéséhez kell. (html-nézőke!)"
 
@@ -2189,8 +2239,9 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Gamma érték változtatása amikor az önműködő javítás gombot használjuk"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "Válasszuk ki a beolvasási területet miután elkészült az előnézet"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2276,30 +2327,36 @@ msgid "port to connect to POP3 server"
 msgstr "A POP3 kiszolgáló portja"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+#, fuzzy
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "A levelet HTML módban küldtük ezzel a képpel: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Adjuk meg a szövegfelismerő parancsát"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr ""
 "Adjuk meg a szövegfelismerő program beállítását a bemeneti fájl megadásához"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr ""
 "Adjuk meg a szövegfelismerő program beállítását a kimeneti fájl megadásához"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Támogatja-e a szövegfelismerő a gui folyamatjelzőt "
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr "Add meg OCR kimenő fájlleírót beállító kapcsolóját(GUI mód)"
 
 #. DESC_OCR_PROGRESS_KEYWORD
@@ -2336,7 +2393,8 @@ msgid "Pick black point"
 msgstr "Fekete pont megadása"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Teljes beolvasási terület"
 
 #. DESC_ZOOM_OUT
@@ -2360,12 +2418,14 @@ msgstr "Utolsó nagyítás visszavonása"
 msgid "Select visible area"
 msgstr "Látható terület kijelölése"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Beolvasási terület önműködő meghatározása"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Beolvasási terület önműködő növelése"
 
 #. DESC_DELETE_IMAGES
@@ -2373,9 +2433,10 @@ msgid "Delete preview image cache"
 msgstr "Előnézeti képmemória törlése"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Előre beállított terület:\n"
@@ -2406,15 +2467,18 @@ msgid "Clone image"
 msgstr "Kép klónozása"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Kép forgatása 90 fokkal"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Kép forgatása 180 fokkal"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Kép forgatása 270 fokkal"
 
 #. DESC_MIRROR_X
@@ -2450,11 +2514,13 @@ msgid "Y-Scale factor"
 msgstr "Y-irányú nagyítás"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Kép nagyítása adott szélességre[képpontban]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Kép nagyítása adott magasságra[képpontban]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2576,7 +2642,8 @@ msgid "Failed to open"
 msgstr "Sikertelen megnyitás"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Nem sikerült biztonságos fájlt létrehozni:"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2652,8 +2719,9 @@ msgid "Failed to execute fax command:"
 msgstr "Nem sikerült a faxparancs végrehajtása:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Nem sikerült a szövegfelismerő elindítása:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Nem sikerült a faxparancs végrehajtása:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2713,11 +2781,12 @@ msgid "warning: option has no value constraint"
 msgstr "vigyázat: option has no value constraint"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Az XSane-t root-ként akartad futtatni. Ez VESZÉLYES!\n"
@@ -2969,6 +3038,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Toolbox>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -2976,7 +3046,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Lehetséges okok:\n"
@@ -3170,7 +3240,8 @@ msgid "E-mail has been sent"
 msgstr "A levél elküldve"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "A fax sorbaállítása"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3232,6 +3303,24 @@ msgstr "Elfogyott a memória"
 msgid "Access to resource has been denied"
 msgstr "A hozzáférés az erőforráshoz megtagadva"
 
+#~ msgid "XSane options"
+#~ msgstr "XSane beállítások"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Nem sikerült a szövegfelismerő elindítása:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Színes felbontás (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Nyomtató gamma értéke:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Nyomtató zöld gammája:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Nyomtató kék gammája:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Nyomtató törlése"
diff --git a/po/it.gmo b/po/it.gmo
index 38e6d15..b95c739 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 8866200..67b2054 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,21 +1,19 @@
-# translation of xsane-0.99_it.po to Italiano
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# Kostantino <ciclope10ATalice.it>, 2006.
-# Kostantino <ciclope10ATalice.it>, 2006.
-#
+# translation of xsane-0.995pre1_it.po to Italiano
+# Costantino Ceoldo <ciclope10ATalice.it>, 2007.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 msgid ""
 msgstr ""
-"Project-Id-Version: xsane-0.99_it\n"
+"Project-Id-Version: xsane-0.995pre1_it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
-"PO-Revision-Date: 2006-01-09 21:47+0100\n"
-"Last-Translator: Kostantino <ciclope10ATalice.it>\n"
-"Language-Team: Italiano <tp@lists.linux.it>\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
+"PO-Revision-Date: 2007-09-16 18:57+0200\n"
+"Last-Translator: Costantino Ceoldo <ciclope10ATalice.it>\n"
+"Language-Team: Italiano <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Main-Translator: Stefano Rivoir <s.rivoir@gts.it>\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Please translate this to the correct directory name (eg. german=>de)
 #. XSANE_LANGUAGE_DIR
@@ -29,7 +27,7 @@ msgstr "(c) "
 #. can be translated with \251
 #. FILENAME_PREFIX_CLONE_OF
 msgid "clone-of-"
-msgstr "Clone-di-"
+msgstr "clone-di-"
 
 #. WINDOW_ABOUT_XSANE
 msgid "About"
@@ -42,7 +40,7 @@ msgstr "Informazioni sulla traduzione"
 
 #. WINDOW_AUTHORIZE
 msgid "authorization"
-msgstr "Autorizzazione"
+msgstr "autorizzazione"
 
 #. WINDOW_GPL
 msgid "GPL - the license"
@@ -54,86 +52,83 @@ msgstr "Licenza Utente Finale (EULA)"
 
 #. WINDOW_INFO
 msgid "info"
-msgstr "Informazioni"
+msgstr "informazioni"
 
 #. WINDOW_LOAD_BATCH_LIST
 msgid "load batch list"
-msgstr "Carica lista batch"
+msgstr "carica lista batch"
 
 #. WINDOW_SAVE_BATCH_LIST
 msgid "save batch list"
-msgstr "Salva lista batch"
+msgstr "salva lista batch"
 
 #. WINDOW_BATCH_SCAN
 msgid "batch scan"
-msgstr "Scansione batch"
+msgstr "acquisizione batch"
 
 #. WINDOW_BATCH_RENAME
 msgid "rename batch area"
-msgstr "Rinomina area batch"
+msgstr "rinomina area batch"
 
 #. WINDOW_FAX_PROJECT
 msgid "fax project"
-msgstr "Progetto fax"
+msgstr "progetto fax"
 
 #. WINDOW_FAX_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for fax project"
-msgstr "Inserisci nome del progetto fax"
+msgstr "sfoglia per progetto fax"
 
 #. WINDOW_FAX_RENAME
 msgid "rename fax page"
-msgstr "Rinomina pagina fax"
+msgstr "rinomina pagina fax"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
-msgstr "Inserisci file PS nel fax"
+msgid "insert PS-file into fax"
+msgstr "Immetti file PS nel fax"
 
 #. WINDOW_EMAIL_PROJECT
 msgid "E-mail project"
 msgstr "Progetto e-mail"
 
 #. WINDOW_EMAIL_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for email project"
-msgstr "Inserisci nome del progetto e-mail"
+msgstr "sfoglia per progetto e-mail"
 
 #. WINDOW_EMAIL_RENAME
 msgid "rename e-mail image"
-msgstr "Rinomina l'immagine e-mail"
+msgstr "rinomina immagine e-mail"
 
 #. WINDOW_EMAIL_INSERT
 msgid "insert file into e-mail"
-msgstr "Inserisci un file nell'e-mail"
+msgstr "inserisci un file nell'e-mail"
 
 #. WINDOW_MULTIPAGE_PROJECT
 msgid "multipage project"
-msgstr "Progetto multipagina"
+msgstr "progetto multipagina"
 
 #. WINDOW_MULTIPAGE_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for multipage project"
-msgstr "Progetto multipagina"
+msgstr "sfoglia per progetto multipagina"
 
 #. WINDOW_PRESET_AREA_RENAME
 msgid "rename preset area"
-msgstr "Rinomina area predefinita"
+msgstr "rinomina area predefinita"
 
 #. WINDOW_PRESET_AREA_ADD
 msgid "add preset area"
-msgstr "Aggiungi area predefinita"
+msgstr "aggiungi area predefinita"
 
 #. WINDOW_MEDIUM_RENAME
 msgid "rename medium"
-msgstr "Rinomina supporto"
+msgstr "rinomina supporto"
 
 #. WINDOW_MEDIUM_ADD
 msgid "add new medium"
-msgstr "Aggiungi nuovo supporto"
+msgstr "aggiungi nuovo supporto"
 
 #. WINDOW_SETUP
 msgid "setup"
-msgstr "Impostazioni"
+msgstr "impostazioni"
 
 #. WINDOW_HISTOGRAM
 msgid "Histogram"
@@ -141,11 +136,11 @@ msgstr "Istogramma"
 
 #. WINDOW_GAMMA
 msgid "Gamma curve"
-msgstr "Curva della gamma"
+msgstr "Curva gamma"
 
 #. WINDOW_STANDARD_OPTIONS
 msgid "Standard options"
-msgstr "Opzioni prestabilite"
+msgstr "Opzioni usuali"
 
 #. WINDOW_ADVANCED_OPTIONS
 msgid "Advanced options"
@@ -153,7 +148,7 @@ msgstr "Opzioni avanzate"
 
 #. WINDOW_DEVICE_SELECTION
 msgid "device selection"
-msgstr "Selezione dispositivo"
+msgstr "selezione dispositivo"
 
 #. WINDOW_PREVIEW
 msgid "Preview"
@@ -166,36 +161,36 @@ msgstr "Visualizzatore"
 
 #. WINDOW_VIEWER_OUTPUT_FILENAME
 msgid "Viewer: select output filename"
-msgstr "Visualizzatore: seleziona il nome del file prodotto"
+msgstr "Visualizzatore: seleziona il nome file di output"
 
 #. WINDOW_OCR_OUTPUT_FILENAME
 msgid "Select output filename for OCR text file"
-msgstr "Seleziona il nome del file prodotto per il file di testo OCR"
+msgstr "Seleziona il nome file di output per il file di testo OCR"
 
 #. WINDOW_OUTPUT_FILENAME
 msgid "select output filename"
-msgstr "Seleziona il nome del file prodotto"
+msgstr "seleziona il nome file di output"
 
 #. WINDOW_SAVE_SETTINGS
 msgid "save device settings"
-msgstr "Salva le impostazioni del dispositivo"
+msgstr "salva impostazioni dispositivo"
 
 #. WINDOW_LOAD_SETTINGS
 msgid "load device settings"
-msgstr "Carica le impostazioni del dispositivo"
+msgstr "carica impostazioni dispositivo"
 
 #. WINDOW_CHANGE_WORKING_DIR
 msgid "change working directory"
-msgstr "Cambia cartella di lavoro"
+msgstr "cambia cartella di lavoro"
 
 #. WINDOW_TMP_PATH
 msgid "select temporary directory"
-msgstr "Seleziona cartella temporanea"
+msgstr "seleziona cartella temporanea"
 
 #. WINDOW_SCALE
 #. DESC_VIEWER_SCALE
 msgid "Scale image"
-msgstr "Ridimensiona l'immagine"
+msgstr "Ridimensiona immagine"
 
 #. WINDOW_DESPECKLE
 #. DESC_VIEWER_DESPECKLE
@@ -205,44 +200,39 @@ msgstr "Applica filtro mediano"
 #. WINDOW_BLUR
 #. DESC_VIEWER_BLUR
 msgid "Blur image"
-msgstr "Sfoca l'immagine"
+msgstr "Sfoca immagine"
 
 #. WINDOW_STORE_MEDIUM
 msgid "Store medium definition"
-msgstr "Salva la definizione del supporto"
+msgstr "Salva definizione supporto"
 
 #. WINDOW_NO_DEVICES
 msgid "No devices available"
-msgstr "Non è disponibile alcun dispositivo"
+msgstr "Nessun dispositivo disponibile"
 
 #. WINDOW_SCANNER_DEFAULT_COLOR_ICM_PROFILE
-#, fuzzy
 msgid "select scanner default color ICM-profile"
-msgstr "Cancella stampante"
+msgstr "seleziona il profilo ICM di colore predefinito dello scanner"
 
 #. WINDOW_SCANNER_DEFAULT_GRAY_ICM_PROFILE
-#, fuzzy
 msgid "select scanner default gray ICM-profile"
-msgstr "Cancella stampante"
+msgstr "seleziona il profilo ICM del grigio predefinito dello scanner"
 
 #. WINDOW_DISPLAY_ICM_PROFILE
 msgid "select display ICM-profile"
-msgstr ""
+msgstr "seleziona il profilo ICM del display"
 
 #. WINDOW_CUSTOM_PROOFING_ICM_PROFILE
-#, fuzzy
 msgid "select custom proofing ICM-profile"
-msgstr "Seleziona il nome del file prodotto"
+msgstr "seleziona il profilo ICM di prova personalizzato"
 
 #. WINDOW_WORKING_COLOR_SPACE_ICM_PROFILE
-#, fuzzy
 msgid "select working color space ICM-profile"
-msgstr "Cancella stampante"
+msgstr "seleziona il profilo ICM dello spazio colore di lavoro"
 
 #. WINDOW_PRINTER_ICM_PROFILE
-#, fuzzy
 msgid "select printer ICM-profile"
-msgstr "Cancella stampante"
+msgstr "seleziona il profilo ICM della stampante"
 
 #. MENU_FILE
 msgid "File"
@@ -254,7 +244,7 @@ msgstr "Preferenze"
 
 #. MENU_VIEW
 msgid "View"
-msgstr "Visualizza"
+msgstr "Vista"
 
 #. MENU_WINDOW
 msgid "Window"
@@ -280,7 +270,7 @@ msgstr "Geometria"
 #. MENU_COLOR_MANAGEMENT
 #. NOTEBOOK_COLOR_MANAGEMENT_OPTIONS
 msgid "Color management"
-msgstr ""
+msgstr "Amministrazione colore"
 
 #. MENU_ITEM_ABOUT_XSANE
 msgid "About XSane"
@@ -358,7 +348,7 @@ msgstr "Immagine accentuata"
 
 #. BUTTON_SCAN
 msgid "Scan"
-msgstr "Scansiona"
+msgstr "Acquisisci"
 
 #. BUTTON_OK
 msgid "Ok"
@@ -398,11 +388,11 @@ msgstr "Sovrascrivi"
 
 #. BUTTON_BATCH_LIST_SCAN
 msgid "Scan batch list"
-msgstr "Scansiona lista batch"
+msgstr "Acquisisci lista batch"
 
 #. BUTTON_BATCH_AREA_SCAN
 msgid "Scan selected area"
-msgstr "Scansiona l'area selezionata"
+msgstr "Acquisisci area selezionata"
 
 #. BUTTON_PAGE_DELETE
 msgid "Delete page"
@@ -434,7 +424,7 @@ msgstr "Rinomina immagine"
 
 #. BUTTON_FILE_INSERT
 msgid "Insert file"
-msgstr "Inserisci file"
+msgstr "Immetti file"
 
 #. BUTTON_CREATE_PROJECT
 msgid "Create project"
@@ -458,7 +448,7 @@ msgstr "Aggiungi stampante"
 
 #. BUTTON_DELETE_PRINTER
 msgid "Delete printer"
-msgstr "Cancella stampante"
+msgstr "Elimina stampante"
 
 #. BUTTON_PREVIEW_ACQUIRE
 msgid "Acquire preview"
@@ -470,11 +460,11 @@ msgstr "Cancella anteprima"
 
 #. BUTTON_DISCARD_IMAGE
 msgid "Discard image"
-msgstr "Cancella immagine"
+msgstr "Rigetta immagine"
 
 #. BUTTON_DISCARD_ALL_IMAGES
 msgid "Discard all images"
-msgstr "Cancella tutte le immagini"
+msgstr "Rigetta tutte le immagini"
 
 #. BUTTON_DO_NOT_CLOSE
 msgid "Do not close"
@@ -494,7 +484,7 @@ msgstr "Posta HTML"
 
 #. RADIO_BUTTON_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device preferences at exit"
-msgstr "Salva le impostazioni del dispositivo all'uscita"
+msgstr "Salva impostazioni dispositivo all'uscita"
 
 #. RADIO_BUTTON_OVERWRITE_WARNING
 msgid "Overwrite warning"
@@ -505,7 +495,7 @@ msgid "Skip existing filenames"
 msgstr "Salta i nomi dei file esistenti"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr "Salva come postscript compresso zlib (ps di livello 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -513,7 +503,7 @@ msgid "Save PDF zlib compressed"
 msgstr "Salva come PDF compresso zlib"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Salva in formato ASCII le immagini PNM a 16 bit"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -525,25 +515,24 @@ msgid "Main window size fixed"
 msgstr "Finestra principale di dimensioni fisse"
 
 #. RADIO_BUTTON_DISABLE_GIMP_PREVIEW_GAMMA
-#, fuzzy
 msgid "Disable GIMP preview gamma"
 msgstr "Disabilita la gamma sull'anteprima di GIMP"
 
 #. RADIO_BUTTON_PRIVATE_COLORMAP
 msgid "Use private colormap"
-msgstr "Usa mappa di colori personale"
+msgstr "Usa mappa colori personale"
 
 #. RADIO_BUTTON_AUTOENHANCE_GAMMA
 msgid "Autoenhance gamma"
 msgstr "Miglioramento automatico della gamma"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
-msgstr "Preselezione dell'area di scansione"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+msgid "Preselect scan area"
+msgstr "Preselezione area di acquisizione"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
 msgid "Autocorrect colors"
-msgstr "Correzione automatica dei colori"
+msgstr "Correzione automatica colori"
 
 #. RADIO_BUTTON_OCR_USE_GUI_PIPE
 msgid "Use GUI progress pipe"
@@ -552,29 +541,24 @@ msgstr "Utilizza la pipe di avanzamento della GUI"
 #. RADIO_BUTTON_CMS_BPC
 #. MENU_ITEM_CMS_BLACK_POINT_COMPENSATION
 msgid "Black point compensation"
-msgstr ""
+msgstr "Compensazione punto nero"
 
 #. TEXT_SCANNING_DEVICES
 msgid "scanning for devices"
-msgstr "Sto cercando i dispositivi..."
+msgstr "sto cercando i dispositivi..."
 
 #. TEXT_AVAILABLE_DEVICES
 msgid "Available devices:"
 msgstr "Dispositivi disponibili:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Opzioni di XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Tipo"
 
 #. TEXT_CMS_FUNCTION
 #. DESC_CMS_FUNCTION
-#, fuzzy
 msgid "Color management function"
-msgstr "Tutto l'intervallo del colore"
+msgstr "Funzione di amministrazione del colore"
 
 #. TEXT_SCANNER_BACKEND
 msgid "Scanner and backend:"
@@ -582,7 +566,7 @@ msgstr "Scanner e backend:"
 
 #. TEXT_VENDOR
 msgid "Vendor:"
-msgstr "Marca:"
+msgstr "Venditore:"
 
 #. TEXT_MODEL
 msgid "Model:"
@@ -610,7 +594,7 @@ msgstr "Valori recenti:"
 
 #. TEXT_GAMMA_CORR_BY
 msgid "Gamma correction by:"
-msgstr "Correzione della gamma mediante:"
+msgstr "Correzione gamma mediante:"
 
 #. TEXT_SCANNER
 msgid "scanner"
@@ -626,36 +610,35 @@ msgstr "niente"
 
 #. TEXT_GAMMA_INPUT_DEPTH
 msgid "Gamma input depth:"
-msgstr "Profondità di ingresso della gamma:"
+msgstr "Profondità di input della gamma:"
 
 #. TEXT_GAMMA_OUTPUT_DEPTH
 msgid "Gamma output depth:"
-msgstr "Profondità d'uscita della gamma:"
+msgstr "Profondità di output della gamma:"
 
 #. TEXT_SCANNER_OUTPUT_DEPTH
 msgid "Scanner output depth:"
-msgstr "Profondità d'uscita dello scanner:"
+msgstr "Profondità di output dello scanner:"
 
 #. TEXT_OUTPUT_FORMATS
 msgid "XSane output formats:"
-msgstr "Formati d'uscita di XSane:"
+msgstr "Formati di output di XSane:"
 
 #. TEXT_8BIT_FORMATS
 msgid "8 bit output formats:"
-msgstr "Formati d'uscita a 8 bit:"
+msgstr "Formati di output a 8 bit:"
 
 #. TEXT_16BIT_FORMATS
 msgid "16 bit output formats:"
-msgstr "Formati d'uscita a 16 bit:"
+msgstr "Formati di output a 16 bit:"
 
 #. TEXT_REDUCE_16BIT_TO_8BIT
-#, fuzzy
 msgid ""
 "Bit depth 16 bits/channel is not supported for this output format.\n"
 "Do you want to reduce the depth to 8 bits/channel?"
 msgstr ""
-"La profondità di 16 bit/colore non è supportata per questo formato.\n"
-"Vuoi ridurla a 8 bit/colore?"
+"La profondità di 16 bit/canale non è supportata per questo formato.\n"
+"Vuoi ridurla a 8 bit/canale?"
 
 #. TEXT_AUTHORIZATION_REQ
 msgid "Authorization required for"
@@ -690,9 +673,8 @@ msgid "package"
 msgstr "pacchetto"
 
 #. TEXT_WITH_CMS_FUNCTION
-#, fuzzy
 msgid "with color management function"
-msgstr "Tutto l'intervallo del colore"
+msgstr "con funzione di amministrazione colore"
 
 #. TEXT_WITH_GIMP_SUPPORT
 msgid "with GIMP support"
@@ -729,7 +711,7 @@ msgid ""
 "\"NO WARRANTY\" agreement.\n"
 msgstr ""
 "XSane è distribuito secondo i termini della GNU General Public License\n"
-"come pubblicato dalla Free Software Foundation, sia nella versione 2 della\n"
+"come pubblicato dalla Free Software Foundation sia nella versione 2 della\n"
 "Licenza, che (a vostra scelta) in una qualunque versione successiva.\n"
 "\n"
 "Questo programma è distribuito nella speranza che possa essere utile ma\n"
@@ -751,20 +733,20 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "XSane è distribuito secondo i termini della GNU General Public License\n"
-"come pubblicato dalla Free Software Foundation, sia nella versione 2 della\n"
+"come pubblicato dalla Free Software Foundation sia nella versione 2 della\n"
 "Licenza, che (a vostra scelta) in una qualunque versione successiva.\n"
 "\n"
-"Questo programma è distribuito nella speranza che possa essere utile, ma\n"
+"Questo programma è distribuito nella speranza che possa essere utile ma\n"
 "SENZA NESSUNA GARANZIA; senza nemmeno l'implicita garanzia di\n"
 "VENDIBILITA' o di UTILITA' PER UN SCOPO PARTICOLARE.\n"
 
 #. TEXT_EMAIL_ADR
 msgid "E-mail:"
-msgstr "Posta elettronica:"
+msgstr "E-mail:"
 
 #. TEXT_HOMEPAGE
 msgid "Homepage:"
-msgstr "Pagina principale:"
+msgstr "Homepage:"
 
 #. TEXT_FILE
 msgid "File:"
@@ -798,7 +780,7 @@ msgstr "Pagine acquisite: "
 
 #. TEXT_EMAIL_TEXT
 msgid "E-mail text:"
-msgstr "Testo dell'e-mail:"
+msgstr "Testo e-mail:"
 
 #. TEXT_ATTACHMENTS
 msgid "Attachments:"
@@ -825,21 +807,21 @@ msgid "Medium Name:"
 msgstr "Nome supporto:"
 
 #. TEXT_VIEWER_IMAGE_INFO
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Size %d x %d pixel, %d bits/channel, %d channels, %1.0f dpi x %1.0f dpi, %"
 "1.1f %s"
 msgstr ""
-"Dimensione %d x %d pixel, %d bit/colore, %d colori, %1.0f dpi x %1.0f dpi, %"
+"Dimensione %d x %d pixel, %d bit/canale, %d colori, %1.0f dpi x %1.0f dpi, %"
 "1.1f %s"
 
 #. TEXT_DESPECKLE_RADIUS
 msgid "Despeckle radius:"
-msgstr "Raggio del filtro mediano:"
+msgstr "Raggio filtro mediano:"
 
 #. TEXT_BLUR_RADIUS
 msgid "Blur radius:"
-msgstr "Raggio di sfocatura:"
+msgstr "Raggio sfocatura:"
 
 #. TEXT_BATCH_AREA_DEFAULT_NAME
 msgid "(no name)"
@@ -851,7 +833,7 @@ msgstr "Nome area:"
 
 #. TEXT_BATCH_LIST_SCANMODE
 msgid "Scanmode:"
-msgstr "Modalità di scansione:"
+msgstr "Modalità di acquisizione:"
 
 #. TEXT_BATCH_LIST_GEOMETRY_TL
 msgid "Top left:"
@@ -890,70 +872,76 @@ msgstr "Comando:"
 msgid "Copy number option:"
 msgstr "Opzione del numero di copie:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+msgid "Scan resolution:"
+msgstr "Risoluzione scanner:"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
-msgstr "Risoluzione binaria (DPI):"
+msgid "lineart [dpi]"
+msgstr "lineart [dpi]"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
-msgstr "Risoluzione in scala di grigi (DPI):"
+msgid "grayscale [dpi]"
+msgstr "scala di grigi [dpi]"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Risoluzione del colore (DPI):"
+msgid "color [dpi]"
+msgstr "colore [dpi]"
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr "Geometria carta:"
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
-msgstr "Larghezza"
+msgid "width"
+msgstr "larghezza"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
-msgstr "Altezza"
+msgid "height"
+msgstr "altezza"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
-msgstr "Margine sinistro"
+msgid "left offset"
+msgstr "margine sinistro"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
-msgstr "Margine inferiore"
+msgid "bottom offset"
+msgstr "margine inferiore"
+
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+msgid "Printer gamma:"
+msgstr "Gamma stampante:"
 
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Valore della gamma della stampante:"
+msgid "common value"
+msgstr "valore comune"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Rosso della gamma della stampante:"
+msgid "red"
+msgstr "rosso"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Verde della gamma della stampante:"
+msgid "green"
+msgstr "verde"
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Blu della gamma della stampante:"
+msgid "blue"
+msgstr "blu"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
-#, fuzzy
 msgid "Embed scanner ICM profile as CSA"
-msgstr "Cancella stampante"
+msgstr "Incapsula il profilo ICM dello scanner come CSA"
 
 #. TEXT_SETUP_PRINTER_EMBED_CRD
-#, fuzzy
 msgid "Embed printer ICM profile as CRD"
-msgstr "Cancella stampante"
+msgstr "Incapsula il profilo ICM della stampante come CRD"
 
 #. TEXT_SETUP_PRINTER_CMS_BPC
 msgid "Apply black point compensation"
-msgstr ""
+msgstr "Applica compensazione punto nero"
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 "Per la stampa crea immagine postscript compressa zlib (PS di livello 3) "
 
@@ -971,11 +959,11 @@ msgstr "Permessi della cartella"
 
 #. TEXT_SETUP_JPEG_QUALITY
 msgid "JPEG image quality"
-msgstr "Qualità dell'immagine JPEG"
+msgstr "Qualità immagine JPEG"
 
 #. TEXT_SETUP_PNG_COMPRESSION
 msgid "PNG image compression"
-msgstr "Compressione dell'immagine PNG"
+msgstr "Compressione immagine PNG"
 
 #. TEXT_SETUP_FILENAME_COUNTER_LEN
 msgid "Filename counter length"
@@ -995,19 +983,19 @@ msgstr "Compressione dell'immagine TIFF a 8 bit"
 
 #. TEXT_SETUP_TIFF_COMPRESSION_1
 msgid "TIFF lineart image compression"
-msgstr "Compressione dell'immagine TIFF binaria"
+msgstr "Compressione dell'immagine TIFF lineart"
 
 #. TEXT_SETUP_SHOW_RANGE_MODE
 msgid "Show range as:"
-msgstr "Visualizza l'intervallo come:"
+msgstr "Visualizza intervallo come:"
 
 #. TEXT_SETUP_PREVIEW_OVERSAMPLING
 msgid "Preview oversampling:"
-msgstr "Sovracampionatura dell'anteprima:"
+msgstr "Sovracampionatura anteprima:"
 
 #. TEXT_SETUP_PREVIEW_GAMMA
 msgid "Preview gamma:"
-msgstr "Gamma dell'anteprima:"
+msgstr "Gamma anteprima:"
 
 #. TEXT_SETUP_PREVIEW_GAMMA_RED
 msgid "Preview gamma red:"
@@ -1047,7 +1035,7 @@ msgstr "Margine soglia:"
 
 #. TEXT_SETUP_GRAYSCALE_SCANMODE
 msgid "Name of grayscale scanmode:"
-msgstr "Nome della modalità di scansione della scala dei grigi:"
+msgstr "Nome della modalità di acquisizione in scala dei grigi:"
 
 #. TEXT_SETUP_HELPFILE_VIEWER
 msgid "Helpfile viewer (HTML):"
@@ -1077,9 +1065,25 @@ msgstr "Imposta valori predefiniti per:"
 msgid "Viewer (Postscript):"
 msgstr "Visualizzatore (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Larghezza"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Altezza"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Margine sinistro"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Margine inferiore"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
-msgstr "Per il fax crea immagine postscript compressa zlib (PS livello 3)"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
+msgstr "Crea immagine postscript compressa zlib (PS livello 3) per il fax"
 
 #. TEXT_SETUP_SMTP_SERVER
 msgid "SMTP server:"
@@ -1115,7 +1119,7 @@ msgstr "Server POP3:"
 
 #. TEXT_SETUP_POP3_PORT
 msgid "POP3 port:"
-msgstr "Porta del server POP3:"
+msgstr "Porta server POP3:"
 
 #. TEXT_SETUP_OCR_COMMAND
 msgid "OCR Command:"
@@ -1123,11 +1127,11 @@ msgstr "Comando OCR:"
 
 #. TEXT_SETUP_OCR_INPUTFILE_OPT
 msgid "Inputfile option:"
-msgstr "Opzione file d'ingresso:"
+msgstr "Opzione file di input:"
 
 #. TEXT_SETUP_OCR_OUTPUTFILE_OPT
 msgid "Outputfile option:"
-msgstr "Opzione file d'uscita:"
+msgstr "Opzione file di output:"
 
 #. TEXT_SETUP_OCR_USE_GUI_PIPE_OPT
 msgid "Use GUI progress pipe:"
@@ -1155,37 +1159,33 @@ msgstr "tutti"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_COLOR_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_COLOR_ICM_PROFILE
-#, fuzzy
 msgid "Scanner default color ICM-profile"
-msgstr "Cancella stampante"
+msgstr "Profilo ICM colore predefinito dello scanner"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_GRAY_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_GRAY_ICM_PROFILE
-#, fuzzy
 msgid "Scanner default gray ICM-profile"
-msgstr "Cancella stampante"
+msgstr "Profilo ICM del grigio predefinito dello scanner"
 
 #. TEXT_SETUP_DISPLAY_ICM_PROFILE
 #. DESC_DISPLAY_ICM_PROFILE
 msgid "Display ICM-profile"
-msgstr ""
+msgstr "Profilo ICM del display"
 
 #. TEXT_SETUP_CUSTOM_PROOFING_ICM_PROFILE
 #. DESC_CUSTOM_PROOFING_ICM_PROFILE
-#, fuzzy
 msgid "Custom proofing ICM-profile"
-msgstr "Cancella stampante"
+msgstr "Profilo ICM di prova personalizzato"
 
 #. TEXT_SETUP_WORKING_COLOR_SPACE_ICM_PROFILE
 #. DESC_WORKING_COLOR_SPACE_ICM_PROFILE
-#, fuzzy
 msgid "Working color space ICM-profile"
-msgstr "Sfoglia per nome immagine"
+msgstr "Profilo ICM dello spazio colore di lavoro"
 
 #. TEXT_SETUP_PRINTER_ICM_PROFILE
 #. DESC_PRINTER_ICM_PROFILE
 msgid "Printer ICM-profile"
-msgstr ""
+msgstr "Profilo ICM della stampante"
 
 msgid "new media"
 msgstr "nuovo supporto"
@@ -1220,7 +1220,7 @@ msgstr "OCR "
 
 #. NOTEBOOK_DISPLAY_OPTIONS
 msgid "Display"
-msgstr "Visualizzazione"
+msgstr "Display"
 
 #. NOTEBOOK_ENHANCE_OPTIONS
 msgid "Enhancement"
@@ -1248,7 +1248,7 @@ msgstr "Mostra curva gamma"
 
 #. MENU_ITEM_SHOW_BATCH_SCAN
 msgid "Show batch scan"
-msgstr "Mostra scansione batch"
+msgstr "Mostra acquisizione batch"
 
 #. MENU_ITEM_SHOW_STANDARDOPTIONS
 msgid "Show standard options"
@@ -1296,21 +1296,20 @@ msgstr "ritardata"
 
 #. MENU_ITEM_SHOW_RESOLUTIONLIST
 msgid "Show resolution list"
-msgstr "Visualizza l'elenco delle risoluzioni"
+msgstr "Visualizza elenco risoluzioni"
 
 #. MENU_ITEM_PAGE_ROTATE
 msgid "Rotate postscript"
-msgstr "Ruota Postscript"
+msgstr "Ruota postscript"
 
 #. MENU_ITEM_ENABLE_COLOR_MANAGEMENT
 #. MENU_ITEM_CMS_ENABLE_COLOR_MANAGEMENT
-#, fuzzy
 msgid "Enable color management"
-msgstr "Tutto l'intervallo del colore"
+msgstr "Abilita amministrazione colore"
 
 #. MENU_ITEM_EDIT_MEDIUM_DEF
 msgid "Edit medium definition"
-msgstr "Salva definizione supporto"
+msgstr "Modifica definizione supporto"
 
 #. MENU_ITEM_SAVE_DEVICE_SETTINGS
 msgid "Save device settings"
@@ -1346,91 +1345,83 @@ msgstr "Backend disponibili"
 
 #. MENU_ITEM_SCANTIPS
 msgid "Scantips"
-msgstr "Consigli sulla scansione"
+msgstr "Consigli sull'acquisizione"
 
 #. MENU_ITEM_PROBLEMS
 msgid "Problems?"
 msgstr "Problemi?"
 
 #. MENU_ITEM_CMS_PROOFING
-#, fuzzy
 msgid "Proofing"
-msgstr "Aggiungi stampante"
+msgstr "Di prova"
 
 #. SUBMENU_ITEM_CMS_PROOF_OFF
 msgid "no proofing (Display)"
-msgstr ""
+msgstr "nessuna prova (Display)"
 
 #. SUBMENU_ITEM_CMS_PROOF_PRINTER
-#, fuzzy
 msgid "Proof printer"
-msgstr "Aggiungi stampante"
+msgstr "Stampante di prova"
 
 #. SUBMENU_ITEM_CMS_PROOF_CUSTOM
 msgid "Proof custom device"
-msgstr ""
+msgstr "Dispositivo personalizzato di prova"
 
 #. MENU_ITEM_CMS_RENDERING_INTENT
-#, fuzzy
 msgid "Rendering intent"
-msgstr "Aggiungi stampante"
+msgstr "Azione di rendering"
 
 #. MENU_ITEM_CMS_PROOFING_INTENT
-#, fuzzy
 msgid "Proofing rendering intent"
-msgstr "Aggiungi stampante"
+msgstr "Azione di rendering di prova"
 
 #. SUBMENU_ITEM_CMS_INTENT_PERCEPTUAL
 msgid "Perceptual"
-msgstr ""
+msgstr "Percettibile"
 
 #. SUBMENU_ITEM_CMS_INTENT_RELATIVE_COLORIMETRIC
 msgid "Relative colorimetric"
-msgstr ""
+msgstr "Colorimetrico relativo"
 
 #. SUBMENU_ITEM_CMS_INTENT_ABSOLUTE_COLORIMETRIC
 msgid "Absolute colorimentric"
-msgstr ""
+msgstr "Colorimetrico assoluto"
 
 #. SUBMENU_ITEM_CMS_INTENT_SATURATION
-#, fuzzy
 msgid "Saturation"
-msgstr "Autorizzazione"
+msgstr "Saturazione"
 
 #. MENU_ITEM_CMS_GAMUT_CHECK
 msgid "Gamut check"
-msgstr ""
+msgstr "Controlla Gamut"
 
 #. MENU_ITEM_CMS_GAMUT_ALARM_COLOR
 msgid "Gamut alarm color"
-msgstr ""
+msgstr "Colore allarme Gamut"
 
 #. SUBMENU_ITEM_CMS_COLOR_BLACK
 msgid "Black"
-msgstr ""
+msgstr "Nero"
 
 #. SUBMENU_ITEM_CMS_COLOR_GRAY
 msgid "Gray"
-msgstr ""
+msgstr "Grigio"
 
 #. SUBMENU_ITEM_CMS_COLOR_WHITE
-#, fuzzy
 msgid "White"
-msgstr "scrivi"
+msgstr "Bianco"
 
 #. SUBMENU_ITEM_CMS_COLOR_RED
-#, fuzzy
 msgid "Red"
-msgstr "Riduci"
+msgstr "Rosso"
 
 #. SUBMENU_ITEM_CMS_COLOR_GREEN
 msgid "Green"
-msgstr ""
+msgstr "Verde"
 
 #. SUBMENU_ITEM_CMS_COLOR_BLUE
-#, fuzzy
 msgid "Blue"
-msgstr "Sfoca"
+msgstr "Blu"
 
 #. MENU_ITEM_COUNTER_LEN_INACTIVE
 msgid "inactive"
@@ -1445,12 +1436,12 @@ msgid "CCITT 1D Huffman compression"
 msgstr "compressione CCITT 1D Huffman"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
-msgstr "compressione CCITT Group 3 Fax"
+msgid "CCITT Group 3 fax compression"
+msgstr "compressione fax CCITT Group 3"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
-msgstr "compressione CCITT Group 4 Fax"
+msgid "CCITT Group 4 fax compression"
+msgstr "compressione fax CCITT Group 4"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
 msgid "JPEG DCT compression"
@@ -1462,7 +1453,7 @@ msgstr "comprimi bit"
 
 #. MENU_ITEM_TIFF_COMP_DEFLATE
 msgid "deflate"
-msgstr "ridimensiona"
+msgstr "riduci"
 
 #. MENU_ITEM_RANGE_SCALE
 msgid "Slider (Scale)"
@@ -1474,27 +1465,27 @@ msgstr "Slider (barra di scorrimento)"
 
 #. MENU_ITEM_RANGE_SPINBUTTON
 msgid "Spinbutton"
-msgstr "Pulsanti Spin"
+msgstr "Spinbutton"
 
 #. MENU_ITEM_RANGE_SCALE_SPIN
 msgid "Scale and Spinbutton"
-msgstr "Scala e Pulsanti Spin"
+msgstr "Scala e Spinbutton"
 
 #. MENU_ITEM_RANGE_SCROLL_SPIN
 msgid "Scrollbar and Spinbutton"
-msgstr "Barra di scorrimento e Pulsanti Spin"
+msgstr "Barra di scorrimento e Spinbutton"
 
 #. MENU_ITEM_LINEART_MODE_STANDARD
 msgid "Standard options window (lineart)"
-msgstr "Finestra delle opzioni usuali (binaria)"
+msgstr "Finestra opzioni usuali (lineart)"
 
 #. MENU_ITEM_LINEART_MODE_XSANE
 msgid "XSane main window (lineart)"
-msgstr "Finestra principale di XSane (binaria)"
+msgstr "Finestra principale di XSane (lineart)"
 
 #. MENU_ITEM_LINEART_MODE_GRAY
 msgid "XSane main window (grayscale->lineart)"
-msgstr "Finestra principale di XSane (scala di grigi ---> binaria)"
+msgstr "Finestra principale di XSane (scala di grigi ---> lineart)"
 
 #. MENU_ITEM_SELECTION_NONE
 msgid "(none)"
@@ -1510,7 +1501,7 @@ msgstr "Aggiungi selezione alla lista"
 
 #. MENU_ITEM_MEDIUM_ADD
 msgid "Add medium definition"
-msgstr "Aggiungi definizione del supporto"
+msgstr "Aggiungi definizione supporto"
 
 #. MENU_ITEM_RENAME
 msgid "Rename item"
@@ -1549,18 +1540,16 @@ msgid "ASMTP CRAM-MD5"
 msgstr "ASMTP CRAM-MD5"
 
 #. MENU_ITEM_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE
-#, fuzzy
 msgid "Embed scanner ICM profile"
-msgstr "Cancella stampante"
+msgstr "Incapsula profilo ICM dello scanner"
 
 #. MENU_ITEM_CMS_FUNCTION_CONVERT_TO_SRGB
 msgid "Convert to sRGB"
-msgstr ""
+msgstr "Converti a sRGB"
 
 #. MENU_ITEM_FUNCTION_CONVERT_TO_WORKING_CS
-#, fuzzy
 msgid "Convert to working color space"
-msgstr "Correzione automatica dei colori"
+msgstr "Converti allo spazio colore di lavoro"
 
 #. PROGRESS_SCANNING
 msgid "Scanning"
@@ -1575,8 +1564,8 @@ msgstr "Sto ricevendo %s dati"
 msgid "page"
 msgstr "pagina"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+msgid "Transferring image"
 msgstr "Trasferimento immagine"
 
 #. PROGRESS_ROTATING_DATA
@@ -1609,20 +1598,19 @@ msgstr "Scalatura immagine"
 
 #. PROGRESS_DESPECKLING_DATA
 msgid "Despeckling image"
-msgstr "Applica filtro mediano all'immagine"
+msgstr "Applicazione filtro mediano all'immagine"
 
 #. PROGRESS_BLURING_DATA
 msgid "Bluring image"
-msgstr "Sfoca immagine"
+msgstr "Sfocatura immagine"
 
 #. PROGRESS_OCR
 msgid "OCR in progress"
 msgstr "OCR in corso"
 
 #. PROGRESS_ICM_CONVERSION
-#, fuzzy
 msgid "converting colors"
-msgstr "Correzione automatica dei colori"
+msgstr "conversione colori"
 
 #. DESC_SCAN_START
 msgid "Start scan <Ctrl-Enter>"
@@ -1651,7 +1639,7 @@ msgstr ""
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -1664,7 +1652,7 @@ msgstr ""
 
 #. DESC_FILENAME_COUNTER_STEP
 msgid "Value that is added to filenamecounter after scan"
-msgstr "Valore aggiunto al contatore dei nomi file dopo la scansione"
+msgstr "Valore aggiunto al contatore dei nomi file dopo l'acquisizione"
 
 #. DESC_BROWSE_FILENAME
 msgid "Browse for image filename"
@@ -1683,58 +1671,52 @@ msgstr ""
 "automaticamente"
 
 #. DESC_FAXPROJECT
-#, fuzzy
 msgid "Enter fax project directory name"
-msgstr "Cerca cartella temporanea"
+msgstr "Immetti il nome della cartella del progetto fax"
 
 #. DESC_FAXPAGENAME
 msgid "Enter new name for faxpage"
-msgstr "Inserisci nuovo nome per la pagina del fax"
+msgstr "Immetti nuovo nome per la pagina fax"
 
 #. DESC_FAXRECEIVER
 msgid "Enter receiver phone number or address"
-msgstr "Inserisci numero telefonico o indirizzo del ricevente"
+msgstr "Immetti numero telefonico o indirizzo del ricevente"
 
 #. DESC_FAX_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for fax project directory"
-msgstr "Cerca cartella temporanea"
+msgstr "Sfoglia per cartella di progetto fax"
 
 #. DESC_EMAIL_PROJECT
-#, fuzzy
 msgid "Enter e-mail project directory name"
-msgstr "Cerca cartella temporanea"
+msgstr "Immetti per cartella di progetto e-mail"
 
 #. DESC_EMAIL_IMAGENAME
 msgid "Enter new name for e-mail image"
-msgstr "Inserisci nuovo nome per l'immagine e-mail"
+msgstr "Immetti nuovo nome per l'immagine e-mail"
 
 #. DESC_EMAIL_RECEIVER
 msgid "Enter e-mail address"
-msgstr "Inserisci indirizzo di posta elettronica"
+msgstr "Immetti indirizzo di posta elettronica"
 
 #. DESC_EMAIL_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for email project directory"
-msgstr "Cerca cartella temporanea"
+msgstr "Sfoglia per cartella di progetto e-mail"
 
 #. DESC_EMAIL_SUBJECT
 msgid "Enter subject of e-mail"
-msgstr "Inserisci argomento dell'e-mail"
+msgstr "Immetti argomento e-mail"
 
 #. DESC_EMAIL_FILETYPE
 msgid "Select filetype for image attachments"
 msgstr "Seleziona il tipo di file per le immagini allegate"
 
 #. DESC_MULTIPAGE_PROJECT
-#, fuzzy
 msgid "Enter multipage project directory name"
-msgstr "Cerca cartella temporanea"
+msgstr "Immetti nome della cartella del progetto multipagina"
 
 #. DESC_MULTIPAGE_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for multipage project directory"
-msgstr "Cerca cartella temporanea"
+msgstr "Sfoglia per cartella di progetto multipagina"
 
 #. DESC_MULTIPAGE_FILETYPE
 msgid "Select filetype for multipage file"
@@ -1742,19 +1724,19 @@ msgstr "Seleziona il tipo di file multipagina"
 
 #. DESC_PRESET_AREA_RENAME
 msgid "Enter new name for preset area"
-msgstr "Inserisci nuovo nome per l'area di preselezione"
+msgstr "Immetti un nuovo nome per l'area preimpostata"
 
 #. DESC_PRESET_AREA_ADD
 msgid "Enter name for new preset area"
-msgstr "Inserisci nome per la nuova area di preselezione"
+msgstr "Immetti un nome per la nuova area preimpostata"
 
 #. DESC_MEDIUM_RENAME
 msgid "Enter new name for medium definition"
-msgstr "Inserisci nuovo nome per la definizione del supporto"
+msgstr "Immetti un nuovo nome per la definizione del supporto"
 
 #. DESC_MEDIUM_ADD
 msgid "Enter name for new medium definition"
-msgstr "Inserisci nome per la nuova definizione del supporto"
+msgstr "Immetti un nome per la nuova definizione del supporto"
 
 #. DESC_PRINTER_SELECT
 msgid "Select printerdefinition <Shift-F1/F2/...>"
@@ -1762,15 +1744,15 @@ msgstr "Seleziona la definizione della stampante <Shift-F1/F2/...>"
 
 #. DESC_RESOLUTION
 msgid "Set scan resolution"
-msgstr "Imposta risoluzione scanner"
+msgstr "Imposta risoluzione di acquisizione"
 
 #. DESC_RESOLUTION_X
 msgid "Set scan resolution for x direction"
-msgstr "Imposta risoluzione per la coordinata X"
+msgstr "Imposta risoluzione di acquisizione per la coordinata X"
 
 #. DESC_RESOLUTION_Y
 msgid "Set scan resolution for y direction"
-msgstr "Imposta risoluzione per la coordinata Y"
+msgstr "Imposta risoluzione di acquisizione per la coordinata Y"
 
 #. DESC_ZOOM
 msgid "Set zoomfactor"
@@ -1859,11 +1841,10 @@ msgstr ""
 " contrasto = 0"
 
 #. DESC_ENH_AUTO
-#, fuzzy
 msgid "Autoadjust gamma, brightness and contrast <Ctrl-a>"
 msgstr ""
 "Calibrazione automatica della gamma, della luminosità e del contrasto <Ctrl-"
-"e>"
+"a>"
 
 #. DESC_ENH_DEFAULT
 msgid ""
@@ -1921,31 +1902,31 @@ msgstr "Definisci un nome per la selezione di questa definizione"
 
 #. DESC_PRINTER_COMMAND
 msgid "Enter command to be executed in copy mode (e.g. \"lpr\")"
-msgstr "Inserisci il comando da eseguire nel modo 'copia' (es. \"lpr\")"
+msgstr "Immetti il comando da eseguire nel modo 'copia' (es. \"lpr\")"
 
 #. DESC_COPY_NUMBER_OPTION
 msgid "Enter option for copy numbers"
-msgstr "Inserisci l'opzione per il numero di copie"
+msgstr "Immetti l'opzione per il numero di copie"
 
 #. DESC_PRINTER_LINEART_RESOLUTION
 msgid ""
 "Resolution with which lineart images are printed and saved in postscript"
 msgstr ""
-"Risoluzione con la quale le immagini vengono stampate e salvate in formato "
-"Postscript"
+"Risoluzione con la quale le immagini lineart vengono stampate e salvate in "
+"formato postscript"
 
 #. DESC_PRINTER_GRAYSCALE_RESOLUTION
 msgid ""
 "Resolution with which grayscale images are printed and saved in postscript"
 msgstr ""
 "Risoluzione con la quale le immagini in scala di grigio vengono stampate e "
-"salvate in formato Postscript"
+"salvate in formato postscript"
 
 #. DESC_PRINTER_COLOR_RESOLUTION
 msgid "Resolution with which color images are printed and saved in postscript"
 msgstr ""
 "Risoluzione con la quale le immagini a colori vengono stampate e salvate in "
-"formato Postscript"
+"formato postscript"
 
 #. DESC_PRINTER_WIDTH
 #. DESC_FAX_WIDTH
@@ -1985,18 +1966,17 @@ msgstr "Valore aggiuntivo della gamma per la componente blu per la fotocopia"
 
 #. DESC_PRINTER_EMBED_CSA
 msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-msgstr ""
+msgstr "Crea un file postscript che contiene il profilo ICM dello scanner"
 
 #. DESC_PRINTER_EMBED_CRD
 msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-msgstr ""
+msgstr "Crea un file postscript che contiene il profilo ICM della stampante"
 
 #. DESC_PRINTER_CMS_BPC
 msgid "Applies black point compensation"
-msgstr ""
+msgstr "Applica la compensazione del punto nero"
 
 #. DESC_PRINTER_PS_FLATEDECODED
-#, fuzzy
 msgid ""
 "Create zlib compressed postscript image for printer (flatedecode).\n"
 "The printer has to understand postscript level 3!"
@@ -2014,13 +1994,13 @@ msgstr "Cerca cartella temporanea"
 
 #. DESC_JPEG_QUALITY
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Qualità in percentuale se l'immagine è salvata come JPEG o TIFF con "
 "compressione di tipo JPEG"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+msgid "Compression if image is saved as PNG"
 msgstr "Compressione se l'immagine viene salvata come PNG"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2028,21 +2008,20 @@ msgid "Minimum length of counter in filename"
 msgstr "Lunghezza minima del contatore nel nome file"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
-msgstr ""
-"Tasso di compressione per le immagini TIFF compresse zip (ridimensiona)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
+msgstr "Tasso di compressione per le immagini TIFF compresse zip (riduci)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Tipo di compressione se l'immagine a 16 bit viene salvata come TIFF"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Tipo di compressione se l'immagine a 8 bit viene salvata come TIFF"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
-msgstr "Tipo compressione se l'immagine binaria viene salvata come TIFF"
+msgid "Compression type if lineart image is saved as TIFF"
+msgstr "Tipo compressione se l'immagine lineart viene salvata come TIFF"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device dependant preferences in default file at exit of xsane"
@@ -2062,7 +2041,6 @@ msgstr ""
 "incrementato automaticamente"
 
 #. DESC_SAVE_PS_FLATEDECODED
-#, fuzzy
 msgid ""
 "compress postscript image with zlib algorithm (flatedecode). When you want "
 "to print such a file your printer has to understand postscript level 3"
@@ -2072,15 +2050,14 @@ msgstr ""
 "stampare un simile file."
 
 #. DESC_SAVE_PDF_FLATEDECODED
-#, fuzzy
 msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr "comprimi immagine PDF con algoritmo zlib (decodifica flat)."
 
 #. DESC_SAVE_PNM16_AS_ASCII
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Usa il formato ASCII invece di quello binario quando un'immagine a 16 bit "
@@ -2089,19 +2066,18 @@ msgstr ""
 "programmi ma produce file giganteschi!!!"
 
 #. DESC_REDUCE_16BIT_TO_8BIT
-#, fuzzy
 msgid ""
 "If scanner sends image with 16 bits/channel save image with 8 bits/channel"
 msgstr ""
-"Salva l'immagine a 8 bit/colore se lo scanner invia immagini a 16 bit/colore"
+"Salva l'immagine a 8 bit/canale se lo scanner invia immagini a 16 bit/canale"
 
 #. DESC_PSFILE_WIDTH
 msgid "Width of paper for postscript files"
-msgstr "Larghezza carta per i file di tipo Postscript"
+msgstr "Larghezza carta per i file di tipo postscript"
 
 #. DESC_PSFILE_HEIGHT
 msgid "Height of paper for postscript files"
-msgstr "Altezza carta per i file di tipo Postscript"
+msgstr "Altezza carta per i file di tipo postscript"
 
 #. DESC_PSFILE_LEFTOFFSET
 msgid ""
@@ -2109,7 +2085,7 @@ msgid ""
 "files"
 msgstr ""
 "Margine sinistro dal bordo del foglio all'area utilizzabile per i file di "
-"tipo Postscript"
+"tipo postscript"
 
 #. DESC_PSFILE_BOTTOMOFFSET
 msgid ""
@@ -2117,7 +2093,7 @@ msgid ""
 "files"
 msgstr ""
 "Margine inferiore dal bordo del foglio all'area utilizzabile per i file di "
-"tipo Postscript"
+"tipo postscript"
 
 #. DESC_MAIN_WINDOW_FIXED
 msgid "Use fixed main window size or scrolled, resizable main window"
@@ -2126,7 +2102,6 @@ msgstr ""
 "scorribile o ridimensionabile"
 
 #. DESC_DISABLE_GIMP_PREVIEW_GAMMA
-#, fuzzy
 msgid "Disable preview gamma when XSane runs as GIMP plugin"
 msgstr ""
 "Disabilita l'anteprima della gamma quando XSane è eseguito come un plugin di "
@@ -2143,7 +2118,7 @@ msgid "Select how a range is displayed"
 msgstr "Seleziona il modo in cui viene visualizzato un intervallo"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr ""
 "Valore per il quale viene moltiplicata la risoluzione calcolata "
 "dell'anteprima"
@@ -2209,7 +2184,7 @@ msgstr ""
 
 #. DESC_ADF_PAGES_MAX
 msgid "Number of pages to scan"
-msgstr "Numero di pagine da scannerizzare"
+msgstr "Numero di pagine da acquisire"
 
 #. DESC_PREVIEW_PIPETTE_RANGE
 msgid "dimension of square that is used to average color for pipette function"
@@ -2217,9 +2192,9 @@ msgstr "E' la dimensione del quadrato usato per il colore medio del contagocce"
 
 #. DESC_DOC_VIEWER
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
-"Inserisci il comando per visualizzare i file di aiuto: deve essere un "
+"Immetti il comando per visualizzare i file di aiuto: deve essere un "
 "visualizzatore HTML!"
 
 #. DESC_AUTOENHANCE_GAMMA
@@ -2228,49 +2203,48 @@ msgstr ""
 "Cambia il valore della gamma quando viene premuto il pulsante del "
 "miglioramento automatico"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
-msgstr "Seleziona l'area di scansione dopo l'acquisizione dell'anteprima"
+#. DESC_PRESELECT_SCAN_AREA
+msgid "Select scan area after preview scan has finished"
+msgstr "Seleziona l'area di acquisizione dopo l'acquisizione dell'anteprima"
 
 #. DESC_AUTOCORRECT_COLORS
 msgid "Do color correction after preview scan has finished"
 msgstr "Applica la correzione dei colori dopo l'acquisizione dell'anteprima"
 
 #. DESC_RENDERING_INTENT
-#, fuzzy
 msgid "Select rendering intent for preview and saving"
-msgstr "Seleziona l'area di scansione dopo l'acquisizione dell'anteprima"
+msgstr "Seleziona l'azione di rendering per l'anteprima e il salvataggio"
 
 #. DESC_CMS_BPC
 msgid "Apply black point compensation when color transformation is done"
 msgstr ""
+"Applica la compensazione di punto nero dopo che la trasformazione del colore "
+"è stata completata"
 
 #. DESC_FAX_COMMAND
 msgid "Enter command to be executed in fax mode"
-msgstr "Inserisci il comando da eseguire in modalità fax"
+msgstr "Immetti il comando da eseguire in modalità fax"
 
 #. DESC_FAX_RECEIVER_OPT
 msgid "Enter option to specify receiver"
-msgstr "Inserisci l'opzione per specificare il ricevente"
+msgstr "Immetti l'opzione per specificare il ricevente"
 
 #. DESC_FAX_POSTSCRIPT_OPT
 msgid "Enter option to specify postscript files following"
-msgstr ""
-"Inserisci l'opzione per specificare che seguono file di tipo Postscript"
+msgstr "Immetti l'opzione per specificare che seguono file di tipo postscript"
 
 #. DESC_FAX_NORMAL_OPT
 msgid "Enter option to specify normal mode (low resolution)"
 msgstr ""
-"Inserisci l'opzione per specificare la modalità normale (bassa risoluzione)"
+"Immetti l'opzione per specificare la modalità normale (bassa risoluzione)"
 
 #. DESC_FAX_FINE_OPT
 msgid "Enter option to specify fine mode (high resolution)"
-msgstr ""
-"Inserisci l'opzione per specificare la modalità fine (alta risoluzione)"
+msgstr "Immetti l'opzione per specificare la modalità fine (alta risoluzione)"
 
 #. DESC_FAX_VIEWER
 msgid "Enter command to be executed to view a fax"
-msgstr "Inserisci il comando da eseguire per visualizzare un fax"
+msgstr "Immetti il comando da eseguire per visualizzare un fax"
 
 #. DESC_FAX_FINE_MODE
 msgid "Send fax with high vertical resolution (196 lpi instead of 98 lpi)"
@@ -2278,7 +2252,6 @@ msgstr ""
 "Invia il fax con un'alta risoluzione verticale (196 lpi invece di 98 lpi)"
 
 #. DESC_FAX_PS_FLATEDECODED
-#, fuzzy
 msgid "Create zlib compressed postscript image for fax (flatedecode)"
 msgstr "Crea immagine postscript compressa zlib per il fax (decodifica flat)"
 
@@ -2292,15 +2265,15 @@ msgstr "Porta del server SMTP a cui connettersi"
 
 #. DESC_EMAIL_FROM
 msgid "enter your e-mail address"
-msgstr "inserisci il tuo indirizzo di posta elettronica"
+msgstr "immetti il tuo indirizzo e-mail"
 
 #. DESC_EMAIL_REPLY_TO
 msgid "enter e-mail address for replied e-mails"
-msgstr "inserisci l'indirizzo a cui inviare le risposte"
+msgstr "immetti l'indirizzo e-mail a cui inviare le risposte"
 
 #. DESC_EMAIL_AUTHENTICATION
 msgid "Type of authentication before sending e-mail"
-msgstr "Tipo di autenticazione prima di spedire un'email"
+msgstr "Tipo di autenticazione prima di spedire e-mail"
 
 #. DESC_EMAIL_AUTH_USER
 msgid "user name for e-mail server"
@@ -2312,40 +2285,42 @@ msgstr "password per il server di posta"
 
 #. DESC_POP3_SERVER
 msgid "IP Address or Domain name of POP3 server"
-msgstr "Indirizzo IP o nome del dominio del server POP3"
+msgstr "indirizzo IP o nome del dominio del server POP3"
 
 #. DESC_POP3_PORT
 msgid "port to connect to POP3 server"
-msgstr "Porta del server POP3 a cui connettersi"
+msgstr "porta del server POP3 a cui connettersi"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+#, fuzzy
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr ""
 "La posta viene spedita in formato HTML, posiziona l'immagine con: <IMMAGINE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
-msgstr "Inserisci il comando per avviare il programma OCR"
+msgid "Enter command to start OCR program"
+msgstr "Immetti il comando per avviare il programma OCR"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
-msgstr "Inserisci l'opzione del programma OCR per definire il file di ingresso"
+msgid "Enter option of the OCR program to define input file"
+msgstr "Immetti l'opzione del programma OCR per definire il file di input"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
-msgstr "Inserisci l'opzione del programma OCR per definire il file d'uscita"
+msgid "Enter option of the OCR program to define output file"
+msgstr "Immetti l'opzione del programma OCR per definire il file di output"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr ""
-"Indica se il programma OCR supporta l'indicatore di avanzamento tramite pipe"
+"Definisco se il programma OCR supporta l'indicatore di avanzamento tramite "
+"pipe"
 
 #. DESC_OCR_OUTFD_OPT
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
-"Inserisci l'opzione del programma OCR per definire il descrittore file "
-"d'uscita in modalità GUI"
+"Immetti l'opzione del programma OCR per definire il descrittore file di "
+"output in modalità GUI"
 
 #. DESC_OCR_PROGRESS_KEYWORD
 msgid "Define Keyword that is used to mark progress information"
@@ -2362,34 +2337,33 @@ msgid "write"
 msgstr "scrivi"
 
 #. DESC_PERMISSION_SEARCH
-#, fuzzy
 msgid "search"
-msgstr "utente"
+msgstr "cerca"
 
 #. DESC_ADD_BATCH
 msgid "Add selection for batch scan"
-msgstr "Aggiungi la selezione per la scansione batch"
+msgstr "Aggiungi selezione per acquisizione batch"
 
 #. DESC_PIPETTE_WHITE
 msgid "Pick white point"
-msgstr "Preleva un punto bianco"
+msgstr "Preleva punto bianco"
 
 #. DESC_PIPETTE_GRAY
 msgid "Pick gray point"
-msgstr "Preleva un punto grigio"
+msgstr "Preleva punto grigio"
 
 #. DESC_PIPETTE_BLACK
 msgid "Pick black point"
-msgstr "Preleva un punto nero"
+msgstr "Preleva punto nero"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
-msgstr "Usa tutta l'area di scansione"
+msgid "Use full scan area"
+msgstr "Usa tutta l'area di acquisizione"
 
 #. DESC_ZOOM_OUT
 #, no-c-format
 msgid "Zoom 20% out"
-msgstr "Riduci l'ingrandimento del 20%"
+msgstr "Riduci ingrandimento del 20%"
 
 #. DESC_ZOOM_IN
 msgid "Click at position to zoom to"
@@ -2397,41 +2371,41 @@ msgstr "Clicca sul punto su cui eseguire lo zoom"
 
 #. DESC_ZOOM_AREA
 msgid "Zoom into selected area"
-msgstr "Ingrandisci l'area selezionata"
+msgstr "Ingrandisci area selezionata"
 
 #. DESC_ZOOM_UNDO
 msgid "Undo last zoom"
-msgstr "Annulla l'ultimo ingrandimento"
+msgstr "Annulla ultimo ingrandimento"
 
 #. DESC_FULL_PREVIEW_AREA
 msgid "Select visible area"
-msgstr "Seleziona l'area visibile"
+msgstr "Seleziona area visibile"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
-msgstr "Seleziona automaticamente l'area di scansione"
+#. DESC_AUTOSELECT_SCAN_AREA
+msgid "Autoselect scan area"
+msgstr "Seleziona automaticamente area di acquisizione"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
-msgstr "Ingrandisci automaticamente l'area di scansione"
+#. DESC_AUTORAISE_SCAN_AREA
+msgid "Autoraise scan area"
+msgstr "Ingrandisci automaticamente area di acquisizione"
 
 #. DESC_DELETE_IMAGES
 msgid "Delete preview image cache"
-msgstr "Cancella l'immagine in cache dell'anteprima"
+msgstr "Elimina l'immagine in cache dell'anteprima"
 
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
-"Area preselezionata:\n"
+"Area preimpostata:\n"
 "usa il menù contestuale (pulsante destro del mouse) per aggiungere una nuova "
 "area o modificarne una già esistente."
 
 #. DESC_ROTATION
 msgid "Rotate preview and scan"
-msgstr "Ruota l'anteprima e scansiona"
+msgstr "Ruota anteprima e acquisisci"
 
 #. DESC_RATIO
 msgid "Aspect ratio of selection"
@@ -2439,31 +2413,31 @@ msgstr "Rapporto d'aspetto della selezione"
 
 #. DESC_PAPER_ORIENTATION
 msgid "Define image position for printing"
-msgstr "Imposta la posizione dell'immagine per la stampa"
+msgstr "Definisci la posizione dell'immagine per la stampa"
 
 #. DESC_VIEWER_OCR
 msgid "Optical Character Recognition"
-msgstr "Riconoscimento Ottico di Caratteri (OCR)"
+msgstr "Riconoscimento Ottico di Caratteri"
 
 #. DESC_VIEWER_UNDO
 msgid "Undo last change"
-msgstr "Annulla l'ultima modifica"
+msgstr "Annulla ultima modifica"
 
 #. DESC_VIEWER_CLONE
 msgid "Clone image"
 msgstr "Duplica immagine"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
-msgstr "Ruota immagine di 90 gradi"
+msgid "Rotate image 90 degrees"
+msgstr "Ruota immagine di 90°"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
-msgstr "Ruota immagine di 180 gradi"
+msgid "Rotate image 180 degrees"
+msgstr "Ruota immagine di 180°"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
-msgstr "Ruota immagine di 270 gradi"
+msgid "Rotate image 270 degrees"
+msgstr "Ruota immagine di 270°"
 
 #. DESC_MIRROR_X
 msgid "Mirror image at vertical axis"
@@ -2487,23 +2461,23 @@ msgstr "Elimina supporto attivo"
 
 #. DESC_SCALE_FACTOR
 msgid "Scale factor"
-msgstr "Imposta fattore di scala"
+msgstr "Fattore di scala"
 
 #. DESC_X_SCALE_FACTOR
 msgid "X-Scale factor"
-msgstr "Fattore per la scala X"
+msgstr "Fattore di scala X"
 
 #. DESC_Y_SCALE_FACTOR
 msgid "Y-Scale factor"
-msgstr "Fattore per la scala Y"
+msgstr "Fattore di scala Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
-msgstr "Riscala l'immagine in larghezza (in pixel)"
+msgid "Scale image to width [pixels]"
+msgstr "Scala immagine in larghezza [pixels]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
-msgstr "Riscala l'immagine in altezza (in pixel)"
+msgid "Scale image to height [pixels]"
+msgstr "Scala immagine in altezza [pixels]"
 
 #. DESC_BATCH_LIST_EMPTY
 msgid "Empty batch list"
@@ -2523,45 +2497,39 @@ msgstr "Rinomina area"
 
 #. DESC_BATCH_ADD
 msgid "Add selected preview area to batch list"
-msgstr "Aggiungi l'area selezionata dell'anteprima alla lista batch"
+msgstr "Aggiungi l'area dell'anteprima selezionata alla lista batch"
 
 #. DESC_BATCH_DEL
 msgid "Delete selected area from batch list"
-msgstr "Togli l'area selezionata dalla lista batch"
+msgstr "Elimina area selezionata dalla lista batch"
 
 #. DESC_AUTOMATIC
 msgid "Turns on automatic mode"
 msgstr "Attiva modalità automatica"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_COLOR_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for scanner default color ICM-profile"
-msgstr "Sfoglia per nome immagine"
+msgstr "Sfoglia per profilo ICM di colore predefinito dello scaner"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_GRAY_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for scanner default gray ICM-profile"
-msgstr "Sfoglia per nome immagine"
+msgstr "Sfoglia per profilo ICM di grigio predefinito dello scanner"
 
 #. DESC_BUTTON_DISPLAY_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for display ICM-profile"
-msgstr "Sfoglia per nome immagine"
+msgstr "Sfoglia per profilo ICM del display"
 
 #. DESC_BUTTON_PRINTER_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for printer ICM-profile"
-msgstr "Sfoglia per nome immagine"
+msgstr "Sfoglia per profilo ICM della stampante"
 
 #. DESC_BUTTON_CUSTOM_PROOFING_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for custom proofing ICM-profile"
-msgstr "Sfoglia per nome immagine"
+msgstr "Sfoglia per profilo ICM di prova personalizzato"
 
 #. DESC_BUTTON_WORKING_COLOR_SPACE_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for working color space ICM-profile"
-msgstr "Sfoglia per nome immagine"
+msgstr "Sfoglia per profilo ICM dello spazio colore di lavoro"
 
 #. ERR_HOME_DIR
 msgid "Failed to determine home directory:"
@@ -2573,7 +2541,7 @@ msgstr "Non è possibile cambiare la cartella di lavoro a"
 
 #. ERR_FILENAME_TOO_LONG
 msgid "Filename too long"
-msgstr "Il nome del file è troppo lungo"
+msgstr "Il nome file è troppo lungo"
 
 #. ERR_CREATE_TEMP_FILE
 msgid ""
@@ -2628,7 +2596,7 @@ msgid "Failed to open"
 msgstr "Impossibile aprire il file"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Non è possibile creare un file sicuro (forse esiste un collegamento):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2704,16 +2672,16 @@ msgid "Failed to execute fax command:"
 msgstr "Non è possibile eseguire il comando fax:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
+msgid "Failed to execute OCR command:"
 msgstr "Non è possibile eseguire il comando OCR:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
-msgstr "E' sbagliato il formato della cornice"
+msgstr "formato frame errato"
 
 #. ERR_FAILED_SET_RESOLUTION
 msgid "unable to set resolution"
-msgstr "Non è possibile impostare la risoluzione"
+msgstr "non è possibile impostare la risoluzione"
 
 #. ERR_PASSWORD_FILE_INSECURE
 #, c-format
@@ -2726,15 +2694,15 @@ msgstr "errore"
 
 #. ERR_MAJOR_VERSION_NR_CONFLICT
 msgid "Sane major version number mismatch!"
-msgstr "La versione di Sane non è compatibile!"
+msgstr "La versione maggiore di Sane non corrisponde!"
 
 #. ERR_XSANE_MAJOR_VERSION
 msgid "XSane major version ="
-msgstr "Versione superiore di XSane ="
+msgstr "versione superiore di XSane ="
 
 #. ERR_BACKEND_MAJOR_VERSION
 msgid "backend major version ="
-msgstr "Versione superiore dei backend ="
+msgstr "versione superiore dei backend ="
 
 #. ERR_PROGRAM_ABORTED
 msgid "*** PROGRAM ABORTED ***"
@@ -2769,7 +2737,7 @@ msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Stai cercando di utilizzare XSane come AMMINISTRATORE DI SISTEMA: è davvero "
@@ -2814,7 +2782,7 @@ msgstr "L'esecuzione di Netscape è fallita!"
 
 #. ERR_SENDFAX_RECEIVER_MISSING
 msgid "Send fax: no receiver defined"
-msgstr "Invio del fax: nessun è stato definito alcun ricevente"
+msgstr "Invio del fax: non è stato definito alcun ricevente"
 
 #. ERR_CREATED_FOR_DEVICE
 msgid "has been created for device"
@@ -2846,7 +2814,7 @@ msgstr "Il file %s non esiste"
 #. ERR_FILE_NOT_POSTSCRIPT
 #, c-format
 msgid "File %s is not a postscript file"
-msgstr "Il file %s non è di tipo Postscript"
+msgstr "Il file %s non è di tipo postscript"
 
 #. ERR_UNSUPPORTED_OUTPUT_FORMAT
 #, c-format
@@ -2854,34 +2822,28 @@ msgid "Unsupported %d-bit output format: %s"
 msgstr "Il formato d'uscita a %d bit non è supportato: %s"
 
 #. ERR_CMS_CONVERSION
-#, fuzzy
 msgid "Error during CMS conversion:"
-msgstr "Si è verificato un errore durante il salvataggio:"
+msgstr "Si è verificato un errore durante la conversione CMS:"
 
 #. ERR_CMS_OPEN_ICM_FILE
-#, fuzzy
 msgid "Could not open"
-msgstr "Impossibile aprire il file"
+msgstr "Impossibile aprire"
 
 #. CMS_SCANNER_ICM
-#, fuzzy
 msgid "scanner ICM profile"
-msgstr "Cancella stampante"
+msgstr "profilo ICM dello scanner"
 
 #. CMS_DISPLAY_ICM
-#, fuzzy
 msgid "display ICM profile"
-msgstr "Sfoglia per nome immagine"
+msgstr "profilo ICM del display"
 
 #. CMS_PROOF_ICM
-#, fuzzy
 msgid "proofing ICM profile"
-msgstr "Cancella stampante"
+msgstr "profilo ICM di prova"
 
 #. ERR_CMS_CREATE_TRANSFORM
-#, fuzzy
 msgid "Could not create transform"
-msgstr "Non è possibile creare il progetto fax"
+msgstr "Non è possibile creare alcuna trasformazione"
 
 #. WARN_VIEWER_IMAGE_NOT_SAVED
 msgid "viewer image is not saved"
@@ -2889,35 +2851,31 @@ msgstr "l'immagine del visualizzatore non è stata salvata"
 
 #. FILE_FILTER_ALL_FILES
 msgid "All files"
-msgstr ""
+msgstr "Tutti i file"
 
 #. FILE_FILTER_IMAGES
-#, fuzzy
 msgid "Images"
-msgstr "Pagine:"
+msgstr "Immagini"
 
 #. FILE_FILTER_XBL
-#, fuzzy
 msgid "XSane batch list"
-msgstr "Salva lista batch"
+msgstr "Lista batch di XSane"
 
 #. FILE_FILTER_ICM
 msgid "ICC/ICM Profiles"
-msgstr ""
+msgstr "Profili ICC/ICM"
 
 #. FILE_FILTER_DRC
-#, fuzzy
 msgid "XSane device preferences"
-msgstr "Salva le impostazioni del dispositivo all'uscita"
+msgstr "Preferenze del dispositivo di XSane"
 
 #. FILE_FILTER_RC
-#, fuzzy
 msgid "XSane preferences"
-msgstr "Preferenze"
+msgstr "Preferenze di XSane"
 
 #. TEXT_USAGE
 msgid "Usage:"
-msgstr "Utilizzo:"
+msgstr "Uso:"
 
 #. TEXT_USAGE_OPTIONS
 msgid "[OPTION]... [DEVICE]"
@@ -3015,15 +2973,15 @@ msgstr ""
 #. Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/"
 #. XSANE_GIMP_MENU_DIALOG
 msgid "<Toolbox>/File/Acquire/XSane: Device dialog..."
-msgstr "<Toolbox>/File/Acquisisci/XSane: Dialogo dispositivo..."
+msgstr "<Toolbox>/File/Acquire/XSane: Dialogo dispositivo..."
 
 #. XSANE_GIMP_MENU
 msgid "<Toolbox>/File/Acquire/XSane: "
-msgstr "<Toolbox>/File/Acquisisci/XSane: "
+msgstr "<Toolbox>/File/Acquire/XSane: "
 
 #. XSANE_GIMP_MENU_DIALOG_OLD
 msgid "<Toolbox>/Xtns/XSane/Device dialog..."
-msgstr "<Toolbox>/Xtns/XSane/Dialogo dispositivo..."
+msgstr "<Toolbox>/Xtns/XSane/Device dialogo..."
 
 #. XSANE_GIMP_MENU_OLD
 msgid "<Toolbox>/Xtns/XSane/"
@@ -3037,7 +2995,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Possibili motivi:\n"
@@ -3047,9 +3005,7 @@ msgstr ""
 "amministratore di sistema\n"
 "4) SANE non ha caricato il backend (man sane-dll)\n"
 "5) Il backend non è configurato correttamente (man san-\"nome backend\")\n"
-"6) E' possibile che siano installate più versioni di SANE\n"
-"7) Il semplice aggiornamento della distribuzione Linux usata può causare "
-"questi inconvenienti"
+"6) E' possibile che siano installate più versioni di SANE"
 
 #. strings that are used in structures, so it is not allowed to use _()/gettext() here
 #. gettext_noop does mark these texts but does not change the string
@@ -3187,7 +3143,7 @@ msgstr "Si è verificato un errore salvando il file"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING
 msgid "Saving file"
-msgstr "Salvataggio del file"
+msgstr "Salvataggio file"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING_ABORTED
 msgid "Aborted saving file"
@@ -3227,19 +3183,19 @@ msgstr "I dati dell'e-mail non sono stati accettati"
 
 #. TEXT_EMAIL_STATUS_SENDING
 msgid "Sending e-mail"
-msgstr "Invio della posta"
+msgstr "Invio posta"
 
 #. TEXT_EMAIL_STATUS_SENT
 msgid "E-mail has been sent"
 msgstr "La posta è stata spedita"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
-msgstr "Invio fax"
+msgid "Queueing fax"
+msgstr "Incodamento fax"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
 msgid "Fax is queued"
-msgstr "Il fax è stato inviato"
+msgstr "Il fax è stato incodato"
 
 #. Sane backend messages
 msgid "flatbed scanner"
@@ -3267,7 +3223,7 @@ msgid "Operation not supported"
 msgstr "L'operazione non è supportata"
 
 msgid "Operation was cancelled"
-msgstr "L'operazione è stata interrotta"
+msgstr "L'operazione è stata cancellata"
 
 msgid "Device busy"
 msgstr "Il dispositivo è occupato"
@@ -3295,62 +3251,3 @@ msgstr "La memoria è esaurita"
 
 msgid "Access to resource has been denied"
 msgstr "L'accesso alla risorsa è negato"
-
-#, fuzzy
-#~ msgid "select scanner transmissive ICM-profile"
-#~ msgstr "Cancella stampante"
-
-#, fuzzy
-#~ msgid "select scanner transmissive gray ICM-profile"
-#~ msgstr "Cancella stampante"
-
-#, fuzzy
-#~ msgid "Scanner reflective ICM-profile"
-#~ msgstr "Cancella stampante"
-
-#, fuzzy
-#~ msgid "Scanner reflective gray ICM-profile"
-#~ msgstr "Cancella stampante"
-
-#, fuzzy
-#~ msgid "Scanner transmissive gray ICM-profile"
-#~ msgstr "Cancella stampante"
-
-#, fuzzy
-#~ msgid "Scanner reflektive ICM-profile"
-#~ msgstr "Cancella stampante"
-
-#, fuzzy
-#~ msgid "Browse for scanner transmissive ICM-profile"
-#~ msgstr "Sfoglia per nome immagine"
-
-#, fuzzy
-#~ msgid "Browse for scanner transmissive gray ICM-profile"
-#~ msgstr "Sfoglia per nome immagine"
-
-#~ msgid "GIMP can't handle depth %d bits/color"
-#~ msgstr "GIMP non può gestire una profondità di %d bit/colore"
-
-#, fuzzy
-#~ msgid "scanner reflective ICM profile"
-#~ msgstr "Cancella stampante"
-
-#, fuzzy
-#~ msgid "Embed scanner/source ICM profile for GIMP"
-#~ msgstr "Cancella stampante"
-
-#~ msgid "Enter name of fax project"
-#~ msgstr "Inserisci nome del progetto fax"
-
-#~ msgid "Enter name of e-mail project"
-#~ msgstr "Inserisci nome del progetto e-mail"
-
-#~ msgid "Enter name of multipage project"
-#~ msgstr "Inserisci nome del progetto multipagina"
-
-#~ msgid ""
-#~ "Gimp does not support depth 16 bits/color.\n"
-#~ "Do you want to reduce the depth to 8 bits/color?"
-#~ msgstr ""
-#~ "GIMP non supporta la profondità di 16 bit/colore.\n"
-#~ "Vuoi ridurla a 8 bit/colore?"
diff --git a/po/ja.gmo b/po/ja.gmo
index 53e9b63..7989931 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 9d6aec9..b61c35e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2004-08-28 12:48+900\n"
 "Last-Translator: Kimizuka Tomokazu <sgtom@pluto.dti.ne.jp>\n"
 "Language-Team: Japanese\n"
@@ -83,7 +83,8 @@ msgid "rename fax page"
 msgstr "FAXページをリネーム"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "PSファイルをFAXに挿入"
 
 #. WINDOW_EMAIL_PROJECT
@@ -508,7 +509,7 @@ msgid "Skip existing filenames"
 msgstr "現在のファイル名をスキップ"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -516,7 +517,8 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "16ビットpnmをasciiフォーマットで保存"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -540,8 +542,9 @@ msgstr "プライベートカラーマップを使う"
 msgid "Autoenhance gamma"
 msgstr "自動強調（ガンマ）"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "スキャン領域の先行指定"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -565,10 +568,6 @@ msgstr "デバイスをスキャンしています"
 msgid "Available devices:"
 msgstr "デバイス使用可能："
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "XSaneのオプション"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "タイプ"
@@ -897,53 +896,72 @@ msgstr "コマンド："
 msgid "Copy number option:"
 msgstr "番号オプションをコピー："
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "スキャナの解像度をセット"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "ラインアート解像度(dpi)："
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "グレースケール解像度(dpi)："
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "色解像度(dpi)："
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "幅"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "高さ"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "左オフセット"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "下オフセット"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "プリンタガンマ 赤："
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "プリンタガンマ値："
+#, fuzzy
+msgid "common value"
+msgstr "最近の値："
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "プリンタガンマ 赤："
+#, fuzzy
+msgid "red"
+msgstr "読込み"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "プリンタガンマ 緑："
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "プリンタガンマ 青："
+#, fuzzy
+msgid "blue"
+msgstr "にじみ"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -960,7 +978,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1084,8 +1102,24 @@ msgstr "プログラムの初期値を設定："
 msgid "Viewer (Postscript):"
 msgstr "ビューワ(PostScript)："
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "幅"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "高さ"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "左オフセット"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "下オフセット"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1457,11 +1491,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "CCITT 1D Huffman 圧縮"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "CCITT Group 3 Fax 圧縮"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "CCITT Group 4 Fax 圧縮"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1590,8 +1626,9 @@ msgstr "データ %s を受信しています"
 msgid "page"
 msgstr "パッケージ"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "画像を変換中"
 
 #. PROGRESS_ROTATING_DATA
@@ -1665,9 +1702,10 @@ msgstr ""
 "メール-<Ctrl-m>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2019,13 +2057,15 @@ msgid "Browse for temporary directory"
 msgstr "一時ディレクトリの参照"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr "JPEG圧縮で保存されたJPEGまたはTIFF画像の画質(%)"
 
 # DESC_PNG_COMPRESSION
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "画像がPNGで保存されていれば圧縮"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2034,19 +2074,22 @@ msgstr "ファイル名のカウンタの最小範囲"
 
 #. DESC_TIFF_ZIP_COMPRESSION
 #, fuzzy
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "8ビット画像がTIFFで保存されている場合の圧縮タイプ"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "16ビット画像がTIFFで保存されている場合の圧縮タイプ"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "8ビット画像がTIFFで保存されている場合の圧縮タイプ"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "ラインアート画像がTIFFで保存されている場合の圧縮タイプ"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2073,10 +2116,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "16ビット画像がPNMフォーマットで保存されるときは、バイナリフォーマットの代わり"
@@ -2128,7 +2172,8 @@ msgid "Select how a range is displayed"
 msgstr "表示する範囲を選択"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "プレビュー解像度に掛けられた計算値"
 
 #. DESC_PREVIEW_GAMMA
@@ -2186,16 +2231,18 @@ msgid "dimension of square that is used to average color for pipette function"
 msgstr "ピペット機能用の標準色に使われる小片の面積"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr "ヘルプファイル表示時に実行されるコマンド(HTMLビューワです!)を入力"
 
 #. DESC_AUTOENHANCE_GAMMA
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "自動強調ボタン押下時にガンマ値を変更"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "プレビュースキャン終了後のスキャン領域を選択"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2286,28 +2333,33 @@ msgstr "POP3サーバへの接続ポート"
 
 #. DESC_HTML_EMAIL
 #, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "メールはHTMLモードで送られ、画像は<IMAGE>タグとともに配置されます。"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "OCRプログラムの開始コマンドを入力"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "入力ファイルを定義するOCRプログラムのオプションを入力"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "出力ファイルを定義するOCRプログラムのオプションを入力"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "OCRプログラムがGUIプログレスパイプをサポートするかを定義"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "GUIモードで出力ファイルディスクリプタを定義するためのOCRプログラムのオプショ"
 "ンを入力"
@@ -2346,7 +2398,8 @@ msgid "Pick black point"
 msgstr "黒点をピック"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "スキャン領域すべてを使用"
 
 #. DESC_ZOOM_OUT
@@ -2370,12 +2423,14 @@ msgstr "前回の拡大を元に戻す"
 msgid "Select visible area"
 msgstr "可視領域を選択"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "スキャン領域の自動選択"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "スキャン領域の自動拡張"
 
 #. DESC_DELETE_IMAGES
@@ -2383,9 +2438,10 @@ msgid "Delete preview image cache"
 msgstr "プレビュー画像のキャッシュを削除"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "プリセット領域：\n"
@@ -2417,15 +2473,18 @@ msgid "Clone image"
 msgstr "画像を複製"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "画像を90°回転"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "画像を180°回転"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "画像を270°回転"
 
 #. DESC_MIRROR_X
@@ -2461,11 +2520,13 @@ msgid "Y-Scale factor"
 msgstr "Y成分の倍率："
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "画像幅の倍率[pixel]："
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "画像高さの倍率[pixel]："
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2587,7 +2648,8 @@ msgid "Failed to open"
 msgstr "開けません"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "安全なファイルを作れません（リンク切れなど）："
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2663,8 +2725,9 @@ msgid "Failed to execute fax command:"
 msgstr "FAXコマンドの実行に失敗しました："
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "OCRコマンドの実行に失敗しました："
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "FAXコマンドの実行に失敗しました："
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2725,11 +2788,12 @@ msgid "warning: option has no value constraint"
 msgstr "警告：オプションは制約条件の値を持っていません"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "ルート権限でXSaneを使うのは、たいへん危険です!\n"
@@ -2981,6 +3045,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Toolbox>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -2988,7 +3053,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "考えられる理由：\n"
@@ -3196,7 +3261,8 @@ msgid "E-mail has been sent"
 msgstr "メールは送信されていません"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "FAXを送信中"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3258,6 +3324,24 @@ msgstr "オーバーフロー"
 msgid "Access to resource has been denied"
 msgstr "リソースへのアクセスが拒否されました"
 
+#~ msgid "XSane options"
+#~ msgstr "XSaneのオプション"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "OCRコマンドの実行に失敗しました："
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "色解像度(dpi)："
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "プリンタガンマ値："
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "プリンタガンマ 緑："
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "プリンタガンマ 青："
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "プリンタ削除"
diff --git a/po/nl.gmo b/po/nl.gmo
index 4e6691d..771dcf8 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 173fbe6..e25f113 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2005-12-22 09:00+0100\n"
 "Last-Translator: Wim Sinke <rietenmeubel@xs4all.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -86,7 +86,8 @@ msgid "rename fax page"
 msgstr "faxpagina hernoemen"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "ps-bestand in fax voegen"
 
 #. WINDOW_EMAIL_PROJECT
@@ -506,7 +507,8 @@ msgid "Skip existing filenames"
 msgstr "Bestaande bestandnamen overslaan"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+#, fuzzy
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr "Opslaan als zlib gecomprimeerd PostScript (level 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -514,7 +516,8 @@ msgid "Save PDF zlib compressed"
 msgstr "Opslaan als PDF zlib gecomprimeerd"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Bewaar 16 bit PNM in ASCII formaat"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -538,8 +541,9 @@ msgstr "Gebruik eigen kleurenpallet"
 msgid "Autoenhance gamma"
 msgstr "Automatisch gamma verbeteren"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Automatisch scangebied selecteren"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -563,10 +567,6 @@ msgstr "Zoeken naar apparaten"
 msgid "Available devices:"
 msgstr "Bruikbare apparaten:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "XSane opties"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Type"
@@ -896,53 +896,72 @@ msgstr "Commando:"
 msgid "Copy number option:"
 msgstr "Aantal kopiëen optie:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Kies de scanresolutie"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Zwart-wit resolutie (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Grijswaarde resolutie (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Kleur resolutie (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Breedte"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Hoogte"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Linker rand"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Onderrand"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Printer gammawaarde rood:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Printer gammawaarde:"
+#, fuzzy
+msgid "common value"
+msgstr "Recente waarden:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Printer gammawaarde rood:"
+#, fuzzy
+msgid "red"
+msgstr "lezen"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Printer gammawaarde groen:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Printer gammawaarde blauw:"
+#, fuzzy
+msgid "blue"
+msgstr "Vervagen"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -959,7 +978,8 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr "Maak zlib gecomprimeerd PostScript (level 3) plaatje voor printen"
 
 #. TEXT_SETUP_TMP_PATH
@@ -1082,8 +1102,25 @@ msgstr "Geef programma standaardwaarden:"
 msgid "Viewer (Postscript):"
 msgstr "Bekijkprogramma (PostScript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Breedte"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Hoogte"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Linker rand"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Onderrand"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr "Maak zlib gecomprimeerd PostScript (level 3) plaatje voor fax"
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1454,11 +1491,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "CCITT 1D Huffman compressie"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "CCITT Group 3 Fax compressie"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "CCITT Group 4 Fax compressie"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1585,8 +1624,9 @@ msgstr "Ontvang %s gegevens"
 msgid "page"
 msgstr "pagina"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Versturen afbeelding"
 
 #. PROGRESS_ROTATING_DATA
@@ -1659,9 +1699,10 @@ msgstr ""
 "m>, fax-<Ctrl-f> of mail-<Ctrl-m>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2013,14 +2054,16 @@ msgid "Browse for temporary directory"
 msgstr "Bekijk de tijdelijke map"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Kwaliteit in procenten als afbeelding als JPEG of TIFF met JPEG compressie "
 "bewaard wordt"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Compressie van PNG afbeeldingen"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2028,19 +2071,23 @@ msgid "Minimum length of counter in filename"
 msgstr "Minimale lengte van bestandenteller"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+#, fuzzy
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Compressie van zip gecomprimeerde TIFF (deflate)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Compressie van 16-bits TIFF afbeeldingen"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Compressie van 8-bits TIFF afbeeldingen"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Compressie van zwart wit TIFF afbeeldingen"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2074,10 +2121,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr "Comprimeer PDF plaatje met zlib algoritme (flatdecode)."
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Gebruik tekst i.p.v. binair formaat om 16 bits afbeeldingen te bewaren. Het "
@@ -2129,7 +2177,8 @@ msgid "Select how a range is displayed"
 msgstr "Selecteer hoe een range vetoond wordt"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Waarde waarmee de berekende preview resolutie vermenigvuldigd wordt"
 
 #. DESC_PREVIEW_GAMMA
@@ -2192,8 +2241,9 @@ msgid "dimension of square that is used to average color for pipette function"
 msgstr "grootte van het vierkantje waar de pipet het gemiddelde berekent"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr "HTML programma om de helpfiles te bekijken"
 
 #. DESC_AUTOENHANCE_GAMMA
@@ -2201,8 +2251,9 @@ msgid "Change gamma value when autoenhancement button is pressed"
 msgstr ""
 "Verander gammawaarde als de automatische aanpassings knop ingedrukt wordt"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "Kies scangebied nadat preview klaar is"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2291,28 +2342,34 @@ msgid "port to connect to POP3 server"
 msgstr "port om met POP3 server te communiceren"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+#, fuzzy
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "E-mail wordt als HTML verstuurd. Afbeeldingen plaatsen met: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Geef commando om tekstherkenningsprogramma te starten"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Geef de optie om een invoerbestand op te geven"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Geef de optie om een uitvoerbestand op te geven"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Ondersteund het OCR programma een GUI progressie pipe"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Geef de optie van het OCR programma om de file descriptor te geven in GUI "
 "mode"
@@ -2351,7 +2408,8 @@ msgid "Pick black point"
 msgstr "Kies zwart punt"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Gebruik volledige scangebied"
 
 #. DESC_ZOOM_OUT
@@ -2375,12 +2433,14 @@ msgstr "Eén zoom terug"
 msgid "Select visible area"
 msgstr "Selecteer zichtbare gebied"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Automatische selectie"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Automatisch naar voren brengen"
 
 #. DESC_DELETE_IMAGES
@@ -2388,9 +2448,10 @@ msgid "Delete preview image cache"
 msgstr "Verwijder preview uit geheugen"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Scangebied:\n"
@@ -2422,15 +2483,18 @@ msgid "Clone image"
 msgstr "Kopiëer afbeelding"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Draai 90 graden"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Draai 180 graden"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Draai 270 graden"
 
 #. DESC_MIRROR_X
@@ -2466,11 +2530,13 @@ msgid "Y-Scale factor"
 msgstr "Vergroting in y-richting"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Schaal afbeelding naar breedte [in pixels]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Schaal afbeelding naar hoogte [in pixels]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2592,7 +2658,8 @@ msgid "Failed to open"
 msgstr "Kon niet openen"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Kon geen 'secure' bestand maken (misschien mist een link):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2670,8 +2737,9 @@ msgid "Failed to execute fax command:"
 msgstr "Kon fax commando niet uitvoeren:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Kon tekstherkenningscommando niet uitvoeren:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Kon fax commando niet uitvoeren:"
 
 # TBD
 #. ERR_BAD_FRAME_FORMAT
@@ -2732,11 +2800,12 @@ msgid "warning: option has no value constraint"
 msgstr "waarschuwing: optie heeft geen waardebeperking"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Je probeert XSane als ROOT te draaien. Dat is heel GEVAARLIJK!\n"
@@ -2989,6 +3058,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Toolbox>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -2996,7 +3066,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Mogelijke redenen:\n"
@@ -3191,7 +3261,8 @@ msgid "E-mail has been sent"
 msgstr "E-mail is verstuurd"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Fax in de wachtrij aan het zetten"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3253,6 +3324,24 @@ msgstr "Geheugen vol"
 msgid "Access to resource has been denied"
 msgstr "Geen toegang tot apparaat"
 
+#~ msgid "XSane options"
+#~ msgstr "XSane opties"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Kon tekstherkenningscommando niet uitvoeren:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Kleur resolutie (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Printer gammawaarde:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Printer gammawaarde groen:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Printer gammawaarde blauw:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Printer verwijderen"
diff --git a/po/pa.gmo b/po/pa.gmo
new file mode 100644
index 0000000..6c15812
--- /dev/null
+++ b/po/pa.gmo
diff --git a/po/pa.po b/po/pa.po
new file mode 100644
index 0000000..cb2d863
--- /dev/null
+++ b/po/pa.po
@@ -0,0 +1,3180 @@
+# translation of pa.po to Punjabi
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# A S Alam <aalam@users.sf.net>, 2007.
+# ASB <aalam@users.sf.net>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: pa\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
+"PO-Revision-Date: 2007-10-04 07:56+0530\n"
+"Last-Translator: ASB <aalam@users.sf.net>\n"
+"Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Please translate this to the correct directory name (eg. german=>de)
+#. XSANE_LANGUAGE_DIR
+msgid "language_dir"
+msgstr "pa"
+
+#. XSANE_COPYRIGHT_SIGN
+msgid "(c)"
+msgstr "(c)"
+
+#. can be translated with \251
+#. FILENAME_PREFIX_CLONE_OF
+msgid "clone-of-"
+msgstr "clone-of-"
+
+#. WINDOW_ABOUT_XSANE
+msgid "About"
+msgstr "ਇਸ ਬਾਰੇ"
+
+#. WINDOW_ABOUT_TRANSLATION, MENU_ITEM_ABOUT_TRANSLATION
+#. MENU_ITEM_ABOUT_TRANSLATION
+msgid "About translation"
+msgstr "ਟਰਾਂਸਲੇਸ਼ਨ ਬਾਰੇ"
+
+#. WINDOW_AUTHORIZE
+msgid "authorization"
+msgstr "ਪਰਮਾਣਕਿਤਾ"
+
+#. WINDOW_GPL
+msgid "GPL - the license"
+msgstr "GPL - ਲਾਈਸੈਂਸ"
+
+#. WINDOW_EULA
+msgid "End User License Agreement"
+msgstr "ਐਂਡ ਯੂਜ਼ਰ ਲਾਈਸੈਂਸ ਇਕਰਾਰਮਾਨਾ (EULA)"
+
+#. WINDOW_INFO
+msgid "info"
+msgstr "ਜਾਣਕਾਰੀ"
+
+#. WINDOW_LOAD_BATCH_LIST
+msgid "load batch list"
+msgstr "ਬੈਂਚ ਲਿਸਟ ਲੋਡ ਕਰੋ"
+
+#. WINDOW_SAVE_BATCH_LIST
+msgid "save batch list"
+msgstr "ਬੈਂਚ ਲਿਸਟ ਸੰਭਾਲੋ"
+
+#. WINDOW_BATCH_SCAN
+msgid "batch scan"
+msgstr "ਬੈਂਚ ਸਕੈਨ"
+
+#. WINDOW_BATCH_RENAME
+msgid "rename batch area"
+msgstr "ਬੈਂਚ ਏਰੀਆ ਨਾਂ-ਬਦਲੋ"
+
+#. WINDOW_FAX_PROJECT
+msgid "fax project"
+msgstr "ਫੈਕਸ ਪ੍ਰੋਜੈਕਟ"
+
+#. WINDOW_FAX_PROJECT_BROWSE
+msgid "browse for fax project"
+msgstr "ਫੈਕਸ ਪ੍ਰੋਜੈਕਟ ਲਈ ਝਲਕ"
+
+#. WINDOW_FAX_RENAME
+msgid "rename fax page"
+msgstr "ਫੈਕਸ ਪੇਜ਼ ਨਾਂ-ਬਦਲੋ"
+
+#. WINDOW_FAX_INSERT
+msgid "insert PS-file into fax"
+msgstr "ਫੈਕਸ ਵਿੱਚ PS-ਫਾਇਲ ਸ਼ਾਮਲ ਕਰੋ"
+
+#. WINDOW_EMAIL_PROJECT
+msgid "E-mail project"
+msgstr "ਈ-ਮੇਲ ਪ੍ਰੋਜੈਕਟ"
+
+#. WINDOW_EMAIL_PROJECT_BROWSE
+msgid "browse for email project"
+msgstr "ਈ-ਮੇਲ ਪ੍ਰੋਜੈਕਟ ਲਈ ਝਲਕ"
+
+#. WINDOW_EMAIL_RENAME
+msgid "rename e-mail image"
+msgstr "ਈ-ਮੇਲ ਚਿੱਤਰ ਨਾਂ ਬਦਲੋ"
+
+#. WINDOW_EMAIL_INSERT
+msgid "insert file into e-mail"
+msgstr "ਈਮੇਲ ਵਿੱਚ ਫਾਇਲ ਸ਼ਾਮਲ ਕਰੋ"
+
+#. WINDOW_MULTIPAGE_PROJECT
+msgid "multipage project"
+msgstr "ਮਲਟੀ-ਪੇਜ਼ ਪ੍ਰੋਜੈਕਟ"
+
+#. WINDOW_MULTIPAGE_PROJECT_BROWSE
+msgid "browse for multipage project"
+msgstr "ਮਲਟੀ-ਪੇਜ਼ ਪ੍ਰੋਜੈਕਟ ਲਈ ਝਲਕ"
+
+#. WINDOW_PRESET_AREA_RENAME
+msgid "rename preset area"
+msgstr "ਪ੍ਰੀ-ਸੈੱਟ ਏਰੀਆ ਨਾਂ-ਬਦਲੋ"
+
+#. WINDOW_PRESET_AREA_ADD
+msgid "add preset area"
+msgstr "ਪ੍ਰੀ-ਸੈੱਟ ਏਰੀਆ ਸ਼ਾਮਲ ਕਰੋ"
+
+#. WINDOW_MEDIUM_RENAME
+msgid "rename medium"
+msgstr "ਮੀਡਿਅਮ ਨਾਂ-ਬਦਲੋ"
+
+#. WINDOW_MEDIUM_ADD
+msgid "add new medium"
+msgstr "ਨਵਾਂ ਮੀਡਿਅਮ ਸ਼ਾਮਲ"
+
+#. WINDOW_SETUP
+msgid "setup"
+msgstr "ਸੈਟਅੱਪ"
+
+#. WINDOW_HISTOGRAM
+msgid "Histogram"
+msgstr "ਹਿਸਟੋਗਰਾਮ"
+
+#. WINDOW_GAMMA
+msgid "Gamma curve"
+msgstr "ਗਾਮਾ ਚਾਪ"
+
+#. WINDOW_STANDARD_OPTIONS
+msgid "Standard options"
+msgstr "ਸਟੈਂਡਰਡ ਚੋਣਾਂ"
+
+#. WINDOW_ADVANCED_OPTIONS
+msgid "Advanced options"
+msgstr "ਤਕਨੀਕੀ ਚੋਣਾਂ"
+
+#. WINDOW_DEVICE_SELECTION
+msgid "device selection"
+msgstr "ਜੰਤਰ ਚੋਣ"
+
+#. WINDOW_PREVIEW
+msgid "Preview"
+msgstr "ਝਲਕ"
+
+#. WINDOW_VIEWER
+#. MENU_ITEM_VIEWER
+msgid "Viewer"
+msgstr "ਦਰਸ਼ਕ"
+
+#. WINDOW_VIEWER_OUTPUT_FILENAME
+msgid "Viewer: select output filename"
+msgstr "ਦਰਸ਼ਕ: ਆਉਟਪੁੱਟ ਫਾਇਲ-ਨਾਂ ਚੁਣੋ"
+
+#. WINDOW_OCR_OUTPUT_FILENAME
+msgid "Select output filename for OCR text file"
+msgstr "OCR ਪਾਠ ਫਾਇਲ ਲਈ ਆਉਟਪੁੱਟ ਫਾਇਲ ਨਾਂ ਚੁਣੋ"
+
+#. WINDOW_OUTPUT_FILENAME
+msgid "select output filename"
+msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ ਨਾਂ ਚੁਣੋ"
+
+#. WINDOW_SAVE_SETTINGS
+msgid "save device settings"
+msgstr "ਜੰਤਰ ਸੈਟਿੰਗ ਸੰਭਾਲੋ"
+
+#. WINDOW_LOAD_SETTINGS
+msgid "load device settings"
+msgstr "ਜੰਤਰ ਸੈਟਿੰਗ ਲੋਡ ਕਰੋ"
+
+#. WINDOW_CHANGE_WORKING_DIR
+msgid "change working directory"
+msgstr "ਵਰਕਿੰਗ ਡਾਇਰੈਕਟਰੀ ਬਦਲੋ"
+
+#. WINDOW_TMP_PATH
+msgid "select temporary directory"
+msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਚੁਣੋ"
+
+#. WINDOW_SCALE
+#. DESC_VIEWER_SCALE
+msgid "Scale image"
+msgstr "ਚਿੱਤਰ ਸਕੇਲ ਕਰੋ"
+
+#. WINDOW_DESPECKLE
+#. DESC_VIEWER_DESPECKLE
+msgid "Despeckle image"
+msgstr "ਡਿਸਪਿਸਕਲੀ ਚਿੱਤਰ"
+
+#. WINDOW_BLUR
+#. DESC_VIEWER_BLUR
+msgid "Blur image"
+msgstr "ਬਲੁਰ ਚਿੱਤਰ"
+
+#. WINDOW_STORE_MEDIUM
+msgid "Store medium definition"
+msgstr "ਸਟੋਰੇਜ਼ ਮੀਡਿਅਮ ਪਰਿਭਾਸ਼ਾ"
+
+#. WINDOW_NO_DEVICES
+msgid "No devices available"
+msgstr "ਕੋਈ ਜੰਤਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
+
+#. WINDOW_SCANNER_DEFAULT_COLOR_ICM_PROFILE
+msgid "select scanner default color ICM-profile"
+msgstr "ਸਕੈਨਰ ਡਿਫਾਲਟ ਰੰਗ ICM-ਪਰੋਫਾਇਲ ਚੁਣੋ"
+
+#. WINDOW_SCANNER_DEFAULT_GRAY_ICM_PROFILE
+msgid "select scanner default gray ICM-profile"
+msgstr "ਸਕੈਨਰ ਡਿਫਾਲਟ ਗਰੇ ICM-ਪਰੋਫਾਇਲ ਚੁਣੋ"
+
+#. WINDOW_DISPLAY_ICM_PROFILE
+msgid "select display ICM-profile"
+msgstr "ਡਿਸਪਲੇਅ ICM-ਪਰੋਫਾਇਲ ਚੁਣੋ"
+
+#. WINDOW_CUSTOM_PROOFING_ICM_PROFILE
+msgid "select custom proofing ICM-profile"
+msgstr "ਕਸਟਮ ਪਰੂਫਿੰਗ ICM-ਪਰੋਫਾਇਲ ਚੁਣੋ"
+
+#. WINDOW_WORKING_COLOR_SPACE_ICM_PROFILE
+msgid "select working color space ICM-profile"
+msgstr "ਵਰਕਿੰਗ ਕਲਰ ਸਪੇਸ ICM-ਪਰੋਫਾਇਲ ਚੁਣੋ"
+
+#. WINDOW_PRINTER_ICM_PROFILE
+msgid "select printer ICM-profile"
+msgstr "ਪਰਿੰਟਰ ICM-ਪਰੋਫਾਇਲ ਚੁਣੋ"
+
+#. MENU_FILE
+msgid "File"
+msgstr "ਫਾਇਲ"
+
+#. MENU_PREFERENCES
+msgid "Preferences"
+msgstr "ਮੇਰੀ ਪਸੰਦ"
+
+#. MENU_VIEW
+msgid "View"
+msgstr "ਵੇਖੋ"
+
+#. MENU_WINDOW
+msgid "Window"
+msgstr "ਵਿੰਡੋ"
+
+#. MENU_HELP
+#. BUTTON_HELP
+msgid "Help"
+msgstr "ਮੱਦਦ"
+
+#. MENU_EDIT
+msgid "Edit"
+msgstr "ਸੋਧ"
+
+#. MENU_FILTERS
+msgid "Filters"
+msgstr "ਫਿਲਟਰ"
+
+#. MENU_GEOMETRY
+msgid "Geometry"
+msgstr "ਜੁਮੈਟਰੀ"
+
+#. MENU_COLOR_MANAGEMENT
+#. NOTEBOOK_COLOR_MANAGEMENT_OPTIONS
+msgid "Color management"
+msgstr "ਰੰਗ ਪਰਬੰਧ"
+
+#. MENU_ITEM_ABOUT_XSANE
+msgid "About XSane"
+msgstr "XSane ਬਾਰੇ"
+
+#. MENU_ITEM_INFO
+msgid "Info"
+msgstr "ਜਾਣਕਾਰੀ"
+
+#. MENU_ITEM_QUIT
+msgid "Quit"
+msgstr "ਬਾਹਰ"
+
+#. MENU_ITEM_SAVE_IMAGE
+#. DESC_VIEWER_SAVE
+msgid "Save image"
+msgstr "ਚਿੱਤਰ ਸੰਭਾਲੋ"
+
+#. MENU_ITEM_OCR
+msgid "OCR - save as text"
+msgstr "OCR - ਟੈਕਸਟ ਵਾਂਗ ਸੰਭਾਲੋ"
+
+#. MENU_ITEM_CLONE
+msgid "Clone"
+msgstr "ਕਲੋਨ"
+
+#. MENU_ITEM_SCALE
+msgid "Scale"
+msgstr "ਸਕੇਲ"
+
+#. MENU_ITEM_CLOSE
+#. BUTTON_CLOSE
+msgid "Close"
+msgstr "ਬੰਦ ਕਰੋ"
+
+#. MENU_ITEM_UNDO
+msgid "Undo"
+msgstr "ਵਾਪਸ"
+
+#. MENU_ITEM_DESPECKLE
+msgid "Despeckle"
+msgstr "ਡਿਸਪਿਸਕਲੀ"
+
+#. MENU_ITEM_BLUR
+msgid "Blur"
+msgstr "ਬਲੁਰ"
+
+#. MENU_ITEM_ROTATE90
+msgid "Rotate 90"
+msgstr "90 ਘੁੰਮਾਓ"
+
+#. MENU_ITEM_ROTATE180
+msgid "Rotate 180"
+msgstr "180 ਘੁੰਮਾਓ"
+
+#. MENU_ITEM_ROTATE270
+msgid "Rotate 270"
+msgstr "270 ਘੁੰਮਾਓ"
+
+#. MENU_ITEM_MIRROR_X
+msgid "Mirror |"
+msgstr "ਮਿੱਰਰ |"
+
+#. MENU_ITEM_MIRROR_Y
+msgid "Mirror -"
+msgstr "ਮਿਰੱਰ -"
+
+#. FRAME_RAW_IMAGE
+msgid "Raw image"
+msgstr "ਰਾਅ ਚਿੱਤਰ"
+
+#. FRAME_ENHANCED_IMAGE
+msgid "Enhanced image"
+msgstr "ਇੰਹਾਂਸਡ ਚਿੱਤਰ"
+
+#. BUTTON_SCAN
+msgid "Scan"
+msgstr "ਸਕੈਨ"
+
+#. BUTTON_OK
+msgid "Ok"
+msgstr "ਠੀਕ ਹੈ"
+
+#. BUTTON_ACCEPT
+msgid "Accept"
+msgstr "ਮਨਜ਼ੂਰ"
+
+#. BUTTON_NOT_ACCEPT
+msgid "Not accept"
+msgstr "ਨਾ ਮਨਜ਼ੂਰ"
+
+#. BUTTON_APPLY
+msgid "Apply"
+msgstr "ਲਾਗੂ ਕਰੋ"
+
+#. BUTTON_CANCEL
+msgid "Cancel"
+msgstr "ਰੱਦ ਕਰੋ"
+
+#. BUTTON_REDUCE
+msgid "Reduce"
+msgstr "ਘਟਾਓ"
+
+#. BUTTON_CONT_AT_OWN_RISK
+msgid "Continue at your own risk"
+msgstr "ਆਪਣੇ ਖੇਤਰ ਉੱਤੇ ਜਾਰੀ ਰੱਖੋ"
+
+#. BUTTON_BROWSE
+msgid "Browse"
+msgstr "ਝਲਕ"
+
+#. BUTTON_OVERWRITE
+msgid "Overwrite"
+msgstr "ਉੱਤੇ ਲਿਖੋ"
+
+#. BUTTON_BATCH_LIST_SCAN
+msgid "Scan batch list"
+msgstr "ਬੈਂਚ ਲਿਸਟ ਸਕੈਨ ਕਰੋ"
+
+#. BUTTON_BATCH_AREA_SCAN
+msgid "Scan selected area"
+msgstr "ਚੁਣਿਆ ਏਰੀਆ ਸਕੈਨ ਕਰੋ"
+
+#. BUTTON_PAGE_DELETE
+msgid "Delete page"
+msgstr "ਪੇਜ਼ ਹਟਾਓ"
+
+#. BUTTON_PAGE_SHOW
+msgid "Show page"
+msgstr "ਪੇਜ਼ ਵੇਖਾਓ"
+
+#. BUTTON_PAGE_RENAME
+msgid "Rename page"
+msgstr "ਪੇਜ਼ ਨਾਂ ਬਦਲੋ"
+
+#. BUTTON_IMAGE_DELETE
+msgid "Delete image"
+msgstr "ਚਿੱਤਰ ਹਟਾਓ"
+
+#. BUTTON_IMAGE_SHOW
+msgid "Show image"
+msgstr "ਚਿੱਤਰ ਵੇਖਾਓ"
+
+#. BUTTON_IMAGE_EDIT
+msgid "Edit image"
+msgstr "ਚਿੱਤਰ ਸੋਧ"
+
+#. BUTTON_IMAGE_RENAME
+msgid "Rename image"
+msgstr "ਚਿੱਤਰ ਨਾਂ ਬਦਲੋ"
+
+#. BUTTON_FILE_INSERT
+msgid "Insert file"
+msgstr "ਫਾਇਲ ਸ਼ਾਮਿਲ"
+
+#. BUTTON_CREATE_PROJECT
+msgid "Create project"
+msgstr "ਪ੍ਰੋਜੈਕਟ ਬਣਾਓ"
+
+#. BUTTON_SEND_PROJECT
+msgid "Send project"
+msgstr "ਪ੍ਰੋਜੈਕਟ ਭੇਜੋ"
+
+#. BUTTON_SAVE_MULTIPAGE
+msgid "Save multipage file"
+msgstr "ਮਲਟੀ-ਪੇਜ਼ ਫਾਇਲ ਸੰਭਾਲੋ"
+
+#. BUTTON_DELETE_PROJECT
+msgid "Delete project"
+msgstr "ਪ੍ਰੋਜੈਕਟ ਹਟਾਓ"
+
+#. BUTTON_ADD_PRINTER
+msgid "Add printer"
+msgstr "ਪਰਿੰਟਰ ਸ਼ਾਮਲ"
+
+#. BUTTON_DELETE_PRINTER
+msgid "Delete printer"
+msgstr "ਪਰਿੰਟਰ ਹਟਾਓ"
+
+#. BUTTON_PREVIEW_ACQUIRE
+msgid "Acquire preview"
+msgstr "ਝਲਕ ਲਵੋ"
+
+#. BUTTON_PREVIEW_CANCEL
+msgid "Cancel preview"
+msgstr "ਝਲਕ ਰੱਦ ਕਰੋ"
+
+#. BUTTON_DISCARD_IMAGE
+msgid "Discard image"
+msgstr "ਚਿੱਤਰ ਰੱਦ ਕਰੋ"
+
+#. BUTTON_DISCARD_ALL_IMAGES
+msgid "Discard all images"
+msgstr "ਸਭ ਚਿੱਤਰ ਰੱਦ ਕਰੋ"
+
+#. BUTTON_DO_NOT_CLOSE
+msgid "Do not close"
+msgstr "ਬੰਦ ਨਾ ਕਰੋ"
+
+#. BUTTON_SCALE_BIND
+msgid "Bind scale"
+msgstr "ਬਲਾਇਡ ਸਕੇਲ"
+
+#. RADIO_BUTTON_FINE_MODE
+msgid "Fine mode"
+msgstr "ਫਾਇਨ ਮੋਡ"
+
+#. RADIO_BUTTON_HTML_EMAIL
+msgid "HTML e-mail"
+msgstr "HTML ਈ-ਮੇਲ"
+
+#. RADIO_BUTTON_SAVE_DEVPREFS_AT_EXIT
+msgid "Save device preferences at exit"
+msgstr "ਬੰਦ ਕਰਨ ਸਮੇਂ ਜੰਤਰ ਪਸੰਦ ਸੰਭਾਲੋ"
+
+#. RADIO_BUTTON_OVERWRITE_WARNING
+msgid "Overwrite warning"
+msgstr "ਉੱਤੇ ਲਿਖਣ ਚੇਤਾਵਨੀ"
+
+#. RADIO_BUTTON_SKIP_EXISTING_NRS
+msgid "Skip existing filenames"
+msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਨਾਂ ਛੱਡੋ"
+
+#. RADIO_BUTTON_SAVE_PS_FLATEDECODED
+msgid "Save postscript zlib compressed (PS level 3)"
+msgstr "ਪੋਸਟ-ਸਕ੍ਰਿਪਟ zlib ਕੰਪਰੈੱਸਡ ਸੰਭਾਲੋ (PS ਲੈਵਲ 3)"
+
+#. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
+msgid "Save PDF zlib compressed"
+msgstr "PDF zlib ਕੰਪਰੈੱਸ ਸੰਭਾਲੋ"
+
+#. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
+msgid "Save 16bit PNM in ASCII format"
+msgstr "6bit PNM ASCII ਫਾਰਮੈਟ ਵਿੱਚ ਸੰਭਾਲੋ"
+
+#. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
+msgid "Reduce 16 bit image to 8 bit"
+msgstr "16 ਬਿੱਟ ਚਿੱਤਰ ਤੋਂ 8 ਬਿੱਟ ਘਟਾਓ"
+
+#. RADIO_BUTTON_WINDOW_FIXED
+msgid "Main window size fixed"
+msgstr "ਮੇਨ ਵਿੰਡੋ ਸਾਇਜ਼ ਸਥਿਰ"
+
+#. RADIO_BUTTON_DISABLE_GIMP_PREVIEW_GAMMA
+msgid "Disable GIMP preview gamma"
+msgstr "ਜੈਮਪ ਝਲਕ ਗਾਮਾ ਆਯੋਗ"
+
+#. RADIO_BUTTON_PRIVATE_COLORMAP
+msgid "Use private colormap"
+msgstr "ਪ੍ਰਾਈਵੇਟ ਰੰਗ-ਮੈਪ ਵਰਤੋਂ"
+
+#. RADIO_BUTTON_AUTOENHANCE_GAMMA
+msgid "Autoenhance gamma"
+msgstr "ਆਟੋ-ਇੰਹਾਂਸ ਗਾਮਾ"
+
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+msgid "Preselect scan area"
+msgstr "ਪ੍ਰੀ-ਚੁਣਿਆ ਸਕੈਨ ਏਰੀਆ"
+
+#. RADIO_BUTTON_AUTOCORRECT_COLORS
+msgid "Autocorrect colors"
+msgstr "ਆਟੋ-ਸੋਧ ਰੰਗ"
+
+#. RADIO_BUTTON_OCR_USE_GUI_PIPE
+msgid "Use GUI progress pipe"
+msgstr "GUI ਪਰੋਗਰੈੱਸ ਪਾਈਪ ਵਰਤੋਂ"
+
+#. RADIO_BUTTON_CMS_BPC
+#. MENU_ITEM_CMS_BLACK_POINT_COMPENSATION
+msgid "Black point compensation"
+msgstr "ਕਾਲਾ ਪੁਆਇੰਟ ਕੰਪਨਸੇਸ਼ਨ"
+
+#. TEXT_SCANNING_DEVICES
+msgid "scanning for devices"
+msgstr "ਜੰਤਰਾਂ ਲਈ ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. TEXT_AVAILABLE_DEVICES
+msgid "Available devices:"
+msgstr "ਉਪਲੱਬਧ ਜੰਤਰ:"
+
+#. TEXT_FILETYPE
+msgid "Type"
+msgstr "ਟਾਈਪ"
+
+#. TEXT_CMS_FUNCTION
+#. DESC_CMS_FUNCTION
+msgid "Color management function"
+msgstr "ਰੰਗ ਪਰਬੰਧ ਫੰਕਸ਼ਨ"
+
+#. TEXT_SCANNER_BACKEND
+msgid "Scanner and backend:"
+msgstr "ਸਕੈਨਰ ਅਤੇ ਬੈਕਐਂਡ:"
+
+#. TEXT_VENDOR
+msgid "Vendor:"
+msgstr "ਵੇਂਡਰ:"
+
+#. TEXT_MODEL
+msgid "Model:"
+msgstr "ਮਾਡਲ:"
+
+#. TEXT_TYPE
+msgid "Type:"
+msgstr "ਕਿਸਮ:"
+
+#. TEXT_DEVICE
+msgid "Device:"
+msgstr "ਜੰਤਰ:"
+
+#. TEXT_LOADED_BACKEND
+msgid "Loaded backend:"
+msgstr "ਲੋਡ ਕੀਤਾ ਬੈਕਐਂਡ:"
+
+#. TEXT_SANE_VERSION
+msgid "Sane version:"
+msgstr "ਸੈਨ ਵਰਜਨ:"
+
+#. TEXT_RECENT_VALUES
+msgid "Recent values:"
+msgstr "ਤਾਜ਼ਾ ਮੁੱਲ:"
+
+#. TEXT_GAMMA_CORR_BY
+msgid "Gamma correction by:"
+msgstr "ਗਾਮਾ ਸੋਧ:"
+
+#. TEXT_SCANNER
+msgid "scanner"
+msgstr "ਸਕੈਨਰ"
+
+#. TEXT_SOFTWARE_XSANE
+msgid "software (XSane)"
+msgstr "ਸਾਫਟਵੇਅਰ (XSane)"
+
+#. TEXT_NONE
+msgid "none"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#. TEXT_GAMMA_INPUT_DEPTH
+msgid "Gamma input depth:"
+msgstr "ਗਾਮਾ ਇੰਪੁੱਟ ਡੂੰਘਾਈ:"
+
+#. TEXT_GAMMA_OUTPUT_DEPTH
+msgid "Gamma output depth:"
+msgstr "ਗਾਮਾ ਆਉਟਪੁੱਟ ਡੂੰਘਾਈ:"
+
+#. TEXT_SCANNER_OUTPUT_DEPTH
+msgid "Scanner output depth:"
+msgstr "ਸਕੈਨਰ ਆਉਟਪੁੱਟ ਡੂੰਘਾਈ:"
+
+#. TEXT_OUTPUT_FORMATS
+msgid "XSane output formats:"
+msgstr "XSane ਆਉਟਪੁੱਟ ਫਾਰਮੈਟ:"
+
+#. TEXT_8BIT_FORMATS
+msgid "8 bit output formats:"
+msgstr "8 ਬਿੱਟ ਆਉਟਪੁੱਟ ਫਾਰਮੈਟ:"
+
+#. TEXT_16BIT_FORMATS
+msgid "16 bit output formats:"
+msgstr "16 ਬਿੱਟ ਆਉਟਪੁੱਟ ਫਾਰਮੈਟ:"
+
+#. TEXT_REDUCE_16BIT_TO_8BIT
+msgid ""
+"Bit depth 16 bits/channel is not supported for this output format.\n"
+"Do you want to reduce the depth to 8 bits/channel?"
+msgstr ""
+"ਇਹ ਆਉਟਪੁੱਟ ਫਾਰਮੈਟ ਵਾਸਤੇ ਬਿੱਟ ਡੂੰਘਾਈ 16 ਬਿੱਟ/ਚੈਨਲ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।\n"
+"ਕੀ ਤੁਸੀਂ ਡੂੰਘਾਈ ਨੂੰ 8 ਬਿੱਟ/ਚੈਨਲ ਵਾਸਤੇ ਘਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#. TEXT_AUTHORIZATION_REQ
+msgid "Authorization required for"
+msgstr "ਇਸ ਲਈ ਆਥੂਰਾਈਜੇਸ਼ਨ ਚਾਹੀਦੀ ਹੈ"
+
+#. TEXT_AUTHORIZATION_SECURE
+msgid "Password transmission is secure"
+msgstr "ਪਾਸਵਰਡ ਟਰਾਂਸਮਿਸ਼ਨ ਸੁਰੱਖਿਅਤ ਹੈ"
+
+#. TEXT_AUTHORIZATION_INSECURE
+msgid "Backend requests plain-text password"
+msgstr "ਬੈਕਐਂਡ ਨੇ ਪਲੇਨ-ਟੈਕਸਟ ਪਾਸਵਰਡ ਦੀ ਮੰਗ ਕੀਤੀ"
+
+#. TEXT_USERNAME
+msgid "Username :"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ :"
+
+#. TEXT_PASSWORD
+msgid "Password :"
+msgstr "ਪਾਸਵਰਡ :"
+
+#. TEXT_INVALID_PARAMS
+msgid "Invalid parameters."
+msgstr "ਗਲਤ ਪੈਰਾਮੀਟਰ ਹੈ।"
+
+#. TEXT_VERSION
+msgid "version:"
+msgstr "ਵਰਜਨ:"
+
+#. TEXT_PACKAGE
+msgid "package"
+msgstr "ਪੈਕੇਜ"
+
+#. TEXT_WITH_CMS_FUNCTION
+msgid "with color management function"
+msgstr "ਰੰਗ ਪਰਬੰਧ ਫੰਕਸ਼ਨ ਨਾਲ"
+
+#. TEXT_WITH_GIMP_SUPPORT
+msgid "with GIMP support"
+msgstr "ਜੈਮਪ ਸਹਿਯੋਗ ਨਾਲ"
+
+#. TEXT_WITHOUT_GIMP_SUPPORT
+msgid "without GIMP support"
+msgstr "ਜੈਮਪ ਸਹਿਯੋਗ ਬਗੈਰ"
+
+#. TEXT_GTK_VERSION
+msgid "compiled with GTK-"
+msgstr "ਕੰਪਾਇਲ ਕੀਤਾ GTK-"
+
+#. TEXT_GIMP_VERSION
+msgid "compiled with GIMP-"
+msgstr "ਕੰਪਾਇਲ ਕੀਤਾ ਹੈ ਜੈਪਮ-"
+
+#. TEXT_UNKNOWN
+msgid "unknown"
+msgstr "ਅਣਜਾਣ"
+
+#. TEXT_EULA
+msgid ""
+"XSane is distributed under the terms of the GNU General Public License\n"
+"as published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"Should the program prove defective, you assume the cost of all\n"
+"necessary servicing, repair or correction. To use this program you\n"
+"have to read, understand and accept the following\n"
+"\"NO WARRANTY\" agreement.\n"
+msgstr ""
+"XSane ਨੂੰ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ,ਜਿਸ ਨੂੰ ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ\n"
+"ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ 2 ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ (ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ ਹੈ)\n"
+"ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।\n"
+"\n"
+"ਇਹ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ, ਪਰ ਇਸ ਦੀ\n"
+"ਕੋਈ ਵਾਰੰਟੀ ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ\n"
+"ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।\n"
+"ਇਹ ਪਰੋਗਰਾਮ ਖਰਾਬ ਵੀ ਹੋ ਸਕਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਸਭ ਸਰਵਿਸ, ਮੁਰੰਮਤ ਜਾਂ ਠੀਕ ਕਰਾਉਣ\n"
+"ਦਾ ਖਰਚਾ ਪੈ ਸਕਦਾ ਹੈ। ਇਹ ਪਰੋਗਰਾਮ ਨੂੰ ਵਰਤਣ ਲਈ ਤੁਹਾਨੂੰ \"NO WARRANTY\"\n"
+"ਇਕਰਾਰਨਾਮਾ ਪੜ੍ਹ ਲੈਣਾ ਚਾਹੀਦਾ ਹੈ\n"
+
+#. TEXT_GPL
+msgid ""
+"XSane is distributed under the terms of the GNU General Public License\n"
+"as published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+msgstr ""
+"XSane ਨੂੰ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ,ਜਿਸ ਨੂੰ ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ\n"
+"ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ 2 ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ (ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ ਹੈ)\n"
+"ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।\n"
+"\n"
+"ਇਹ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ, ਪਰ ਇਸ ਦੀ\n"
+"ਕੋਈ ਵਾਰੰਟੀ ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ\n"
+"ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।\n"
+
+#. TEXT_EMAIL_ADR
+msgid "E-mail:"
+msgstr "ਈ-ਮੇਲ:"
+
+#. TEXT_HOMEPAGE
+msgid "Homepage:"
+msgstr "ਮੇਨ ਪੇਜ਼:"
+
+#. TEXT_FILE
+msgid "File:"
+msgstr "ਫਾਇਲ:"
+
+#. TEXT_TRANSLATION
+msgid "Translation:"
+msgstr "ਟਰਾਂਸਲੇਸ਼ਨ:"
+
+#. Please translate this to something like
+#. translation to YOUR LANGUAGE\n
+#. by YOUR NAME\n
+#. E-mail: your.name@yourdomain.com\n
+#. TEXT_TRANSLATION_INFO
+msgid ""
+"untranslated original english text\n"
+"by Oliver Rauch\n"
+"E-mail: Oliver.Rauch@rauch-domain.de\n"
+msgstr ""
+"ਪੰਜਾਬੀ ਵਿੱਚ ਅਨੁਵਾਦ ਕੀਤਾ ਲਿਖਿਆ\n"
+"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ\n"
+"ਟੀਮ: ਪੰਜਾਬੀ ਓਪਨ ਸੋਰਸ ਟੀਮ (http://www.satluj.org)\n"
+
+#. TEXT_INFO_BOX
+msgid "0x0: 0KB"
+msgstr "0x0: 0KB"
+
+#. TEXT_ADF_PAGES_SCANNED
+msgid "Scanned pages: "
+msgstr "ਸਕੈਨ ਕੀਤੇ ਸਫ਼ੇ: "
+
+#. TEXT_EMAIL_TEXT
+msgid "E-mail text:"
+msgstr "ਈ-ਮੇਲ ਟੈਕਸਟ:"
+
+#. TEXT_ATTACHMENTS
+msgid "Attachments:"
+msgstr "ਅਟੈਂਚਮਿੰਟ:"
+
+#. TEXT_EMAIL_STATUS
+msgid "Project status:"
+msgstr "ਪ੍ਰੋਜੈਕਟ ਹਾਲਤ:"
+
+#. TEXT_EMAIL_FILETYPE
+msgid "E-mail image filetype:"
+msgstr "ਈਮੇਲ ਚਿੱਤਰ ਫਾਇਲ-ਟਾਈਪ:"
+
+#. TEXT_PAGES
+msgid "Pages:"
+msgstr "ਪੇਜ਼:"
+
+#. TEXT_MULTIPAGE_FILETYPE
+msgid "Multipage document filetype:"
+msgstr "ਮਲਟੀ-ਪੇਜ਼ ਦਸਤਾਵੇਜ਼ ਫਾਇਲ ਟਾਈਪ:"
+
+#. TEXT_MEDIUM_DEFINITION_NAME
+msgid "Medium Name:"
+msgstr "ਮੀਡਿਅਮ ਨਾਂ:"
+
+#. TEXT_VIEWER_IMAGE_INFO
+#, c-format
+msgid ""
+"Size %d x %d pixel, %d bits/channel, %d channels, %1.0f dpi x %1.0f dpi, %"
+"1.1f %s"
+msgstr ""
+"ਆਕਾਰ %d x %d ਪਿਕਸਲ, %d ਬਿੱਟ/ਚੈਨਲ, %d ਚੈਨਲ, %1.0f dpi x %1.0f dpi, %1.1f %s"
+
+#. TEXT_DESPECKLE_RADIUS
+msgid "Despeckle radius:"
+msgstr "ਡਿਸਪਿਸਲਕੀ ਰੇਡੀਅਸ:"
+
+#. TEXT_BLUR_RADIUS
+msgid "Blur radius:"
+msgstr "ਬਲੁਰ ਰੇਡੀਅਸ:"
+
+#. TEXT_BATCH_AREA_DEFAULT_NAME
+msgid "(no name)"
+msgstr "(ਨਾਂ ਨਹੀਂ)"
+
+#. TEXT_BATCH_LIST_AREANAME
+msgid "Area name:"
+msgstr "ਏਰੀਆ ਨਾਂ:"
+
+#. TEXT_BATCH_LIST_SCANMODE
+msgid "Scanmode:"
+msgstr "ਸਕੈਨ-ਮੋਡ:"
+
+#. TEXT_BATCH_LIST_GEOMETRY_TL
+msgid "Top left:"
+msgstr "ਉੱਤੇ ਖੱਬਾ:"
+
+#. TEXT_BATCH_LIST_GEOMETRY_SIZE
+msgid "Size:"
+msgstr "ਆਕਾਰ:"
+
+#. TEXT_BATCH_LIST_RESOLUTION
+msgid "Resolution:"
+msgstr "ਰੈਜ਼ੋਲੇਸ਼ਨ:"
+
+#. TEXT_BATCH_LIST_BIT_DEPTH
+msgid "Bit depth:"
+msgstr "ਬਿੱਟ ਡੂੰਘਾਈ:"
+
+#. TEXT_BATCH_LIST_BY_GUI
+msgid "as selected"
+msgstr "ਜਿਵੇਂ ਚੁਣਿਆ"
+
+#. TEXT_SETUP_PRINTER_SEL
+msgid "Printer selection:"
+msgstr "ਪਰਿੰਟਰ ਚੋਣ:"
+
+#. TEXT_SETUP_PRINTER_NAME
+msgid "Name:"
+msgstr "ਨਾਂ:"
+
+#. TEXT_SETUP_PRINTER_CMD, TEXT_SETUP_FAX_CMD
+#. TEXT_SETUP_FAX_COMMAND
+msgid "Command:"
+msgstr "ਕਮਾਂਡ:"
+
+#. TEXT_SETUP_COPY_NR_OPT
+msgid "Copy number option:"
+msgstr "ਕਾਪੀ ਗਿਣਤੀ ਚੋਣ:"
+
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+msgid "Scan resolution:"
+msgstr "ਸਕੈਨ ਰੈਜ਼ੋਲੇਸ਼ਨ:"
+
+#. TEXT_SETUP_PRINTER_LINEART_RES
+msgid "lineart [dpi]"
+msgstr "ਲੀਨੀਅਰਟ [dpi]"
+
+#. TEXT_SETUP_PRINTER_GRAYSCALE_RES
+msgid "grayscale [dpi]"
+msgstr "ਗਰੇ-ਸਕੇਲ [dpi]"
+
+#. TEXT_SETUP_PRINTER_COLOR_RES
+msgid "color [dpi]"
+msgstr "ਕਲਰ [dpi]"
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr "ਪੇਪਰ ਜੁਮੈਟਰੀ:"
+
+#. TEXT_SETUP_PRINTER_WIDTH
+msgid "width"
+msgstr "ਚੌੜਾਈ"
+
+#. TEXT_SETUP_PRINTER_HEIGHT
+msgid "height"
+msgstr "ਉਚਾਈ"
+
+#. TEXT_SETUP_PRINTER_LEFT
+msgid "left offset"
+msgstr "ਖੱਬਾ ਆਫਸੈੱਟ"
+
+#. TEXT_SETUP_PRINTER_BOTTOM
+msgid "bottom offset"
+msgstr "ਤਲ ਆਫਸੈੱਟ"
+
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+msgid "Printer gamma:"
+msgstr "ਪਰਿੰਟਰ ਗਾਮਾ:"
+
+#. TEXT_SETUP_PRINTER_GAMMA
+msgid "common value"
+msgstr "ਆਮ ਮੁੱਲ"
+
+#. TEXT_SETUP_PRINTER_GAMMA_RED
+msgid "red"
+msgstr "ਲਾਲ"
+
+#. TEXT_SETUP_PRINTER_GAMMA_GREEN
+msgid "green"
+msgstr "ਹਰਾ"
+
+#. TEXT_SETUP_PRINTER_GAMMA_BLUE
+msgid "blue"
+msgstr "ਨੀਲਾ"
+
+#. TEXT_SETUP_PRINTER_EMBED_CSA
+msgid "Embed scanner ICM profile as CSA"
+msgstr "ਇੰਬੈੱਡ ਸਕੈਨਰ ICM ਪਰੋਫਾਇਲ CSA ਵਾਂਗ"
+
+#. TEXT_SETUP_PRINTER_EMBED_CRD
+msgid "Embed printer ICM profile as CRD"
+msgstr "ਇੰਬੈੱਡ ਪਰਿੰਟਰ ICM ਪਰੋਫਾਇਲ CRD ਵਾਂਗ"
+
+#. TEXT_SETUP_PRINTER_CMS_BPC
+msgid "Apply black point compensation"
+msgstr "ਕਾਲਾ ਪੁਆਇੰਟ ਕੰਪਨਸੇਸ਼ਨ ਲਾਗੂ ਕਰੋ"
+
+#. TEXT_SETUP_PRINTER_PS_FLATEDECODED
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
+msgstr "ਪਰਿੰਟਿੰਗ ਲਈ zlib ਕੰਪਰੈੱਸਡ ਪੋਸਟਸਕ੍ਰਿਪਟ ਚਿੱਤਰ (PS ਲੈਵਲ 3) ਬਣਾਓ"
+
+#. TEXT_SETUP_TMP_PATH
+msgid "Temporary directory"
+msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ"
+
+#. TEXT_SETUP_IMAGE_PERMISSION
+msgid "Image-file permissions"
+msgstr "ਚਿੱਤਰ-ਫਾਇਲ ਅਧਿਕਾਰ"
+
+#. TEXT_SETUP_DIR_PERMISSION
+msgid "Directory permissions"
+msgstr "ਡਾਇਰੈਕਟਰੀ ਅਧਿਕਾਰ"
+
+#. TEXT_SETUP_JPEG_QUALITY
+msgid "JPEG image quality"
+msgstr "JPEG ਚਿੱਤਰ ਕੁਆਲਟੀ"
+
+#. TEXT_SETUP_PNG_COMPRESSION
+msgid "PNG image compression"
+msgstr "PNG ਚਿੱਤਰ ਕੰਪਰੈਸ਼ਨ"
+
+#. TEXT_SETUP_FILENAME_COUNTER_LEN
+msgid "Filename counter length"
+msgstr "ਫਾਇਲ-ਨਾਂ ਕਾਊਂਟਰ ਲੰਬਾਈ"
+
+#. TEXT_SETUP_TIFF_ZIP_COMPRESSION
+msgid "TIFF zip compression rate"
+msgstr "TIFF ਜ਼ਿਪ ਕੰਪਰੈਸ਼ਨ ਰੇਟ"
+
+#. TEXT_SETUP_TIFF_COMPRESSION_16
+msgid "TIFF 16 bit image compression"
+msgstr "TIFF 16 ਬਿੱਟ ਚਿੱਤਰ ਕੰਪਰੈਸ਼ਨ"
+
+#. TEXT_SETUP_TIFF_COMPRESSION_8
+msgid "TIFF 8 bit image compression"
+msgstr "TIFF 8 ਬਿੱਟ ਚਿੱਤਰ ਕੰਪਰੈਸ਼ਨ"
+
+#. TEXT_SETUP_TIFF_COMPRESSION_1
+msgid "TIFF lineart image compression"
+msgstr "TIFF ਲੀਨੀਅਰਟ ਚਿੱਤਰ ਕੰਪਰੈਸ਼ਨ"
+
+#. TEXT_SETUP_SHOW_RANGE_MODE
+msgid "Show range as:"
+msgstr "ਰੇਜ਼ ਇੰਝ ਵੇਖੋ:"
+
+#. TEXT_SETUP_PREVIEW_OVERSAMPLING
+msgid "Preview oversampling:"
+msgstr "ਝਲਕ ਓਵਰ-ਸੈਂਪਲਿੰਗ:"
+
+#. TEXT_SETUP_PREVIEW_GAMMA
+msgid "Preview gamma:"
+msgstr "ਝਲਕ ਗਾਮਾ:"
+
+#. TEXT_SETUP_PREVIEW_GAMMA_RED
+msgid "Preview gamma red:"
+msgstr "ਝਲਕ ਗਾਮਾ ਲਾਲ:"
+
+#. TEXT_SETUP_PREVIEW_GAMMA_GREEN
+msgid "Preview gamma green:"
+msgstr "ਝਲਕ ਗਾਮਾ ਹਰਾ:"
+
+#. TEXT_SETUP_PREVIEW_GAMMA_BLUE
+msgid "Preview gamma blue:"
+msgstr "ਝਲਕ ਗਾਮਾ ਨੀਲਾ:"
+
+#. TEXT_SETUP_LINEART_MODE
+msgid "Threshold option:"
+msgstr "ਥਰੈਸ਼ਹੋਲਡ ਚੋਣ:"
+
+#. TEXT_SETUP_PREVIEW_PIPETTE_RANGE
+msgid "Preview pipette range"
+msgstr "ਝਲਕ ਪਿਪੱਟ (pipette) ਰੇਜ਼"
+
+#. TEXT_SETUP_THRESHOLD_MIN
+msgid "Threshold minimum:"
+msgstr "ਥਰੈਸ਼ਹੋਲਡ ਘੱਟੋ-ਘੱਟ:"
+
+#. TEXT_SETUP_THRESHOLD_MAX
+msgid "Threshold maximum:"
+msgstr "ਥਰੈਸ਼ਹੋਲਡ ਵੱਧੋ-ਵੱਧ:"
+
+#. TEXT_SETUP_THRESHOLD_MUL
+msgid "Threshold multiplier:"
+msgstr "ਥਰੈਸ਼ਹੋਲਡ ਮਲਟੀਪਲਾਇਰ:"
+
+#. TEXT_SETUP_THRESHOLD_OFF
+msgid "Threshold offset:"
+msgstr "ਥਰੈਸ਼ਹੋਲਡ ਆਫਸੈੱਟ"
+
+#. TEXT_SETUP_GRAYSCALE_SCANMODE
+msgid "Name of grayscale scanmode:"
+msgstr "ਗਰੇ-ਸਕੇਲ ਸਕੈਨ-ਮੋਡ ਦਾ ਨਾਂ:"
+
+#. TEXT_SETUP_HELPFILE_VIEWER
+msgid "Helpfile viewer (HTML):"
+msgstr "ਮੱਦਦ-ਫਾਇਲ ਦਰਸ਼ਕ (HTML):"
+
+#. TEXT_SETUP_FAX_RECEIVER_OPTION
+msgid "Receiver option:"
+msgstr "ਰਿਸੀਵਰ ਚੋਣ:"
+
+#. TEXT_SETUP_FAX_POSTSCRIPT_OPT
+msgid "Postscriptfile option:"
+msgstr "ਪੋਸਟਸਕ੍ਰਿਪਟ ਫਾਇਲ ਚੋਣਾਂ:"
+
+#. TEXT_SETUP_FAX_NORMAL_MODE_OPT
+msgid "Normal mode option:"
+msgstr "ਨਾਰਮਲ ਮੋਡ ਚੋਣ:"
+
+#. TEXT_SETUP_FAX_FINE_MODE_OPT
+msgid "Fine mode option:"
+msgstr "ਫਾਇਨ ਮੋਡ ਚੋਣ:"
+
+#. TEXT_SETUP_FAX_PROGRAM_DEFAULTS
+msgid "Set program defaults for:"
+msgstr "ਇਸ ਲਈ ਪਰੋਗਰਾਮ ਡਿਫਾਲਟ ਸੈੱਟ ਕਰੋ:"
+
+#. TEXT_SETUP_FAX_VIEWER
+msgid "Viewer (Postscript):"
+msgstr "ਦਰਸ਼ਕ (ਪੋਸਟ-ਸਕ੍ਰਿਪਟ):"
+
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "ਚੌੜਾਈ"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "ਉਚਾਈ"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "ਖੱਬੇ ਆਫਸੈੱਟ"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "ਤਲ ਆਫਸੈੱਟ"
+
+#. TEXT_SETUP_FAX_PS_FLATEDECODED
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
+msgstr "ਫੈਕਸ ਲਈ zlib ਕੰਪਰੈੱਸਡ ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਚਿੱਤਰ (PS ਲੈਵਲ 3) ਬਣਾਓ"
+
+#. TEXT_SETUP_SMTP_SERVER
+msgid "SMTP server:"
+msgstr "SMTP ਸਰਵਰ:"
+
+#. TEXT_SETUP_SMTP_PORT
+msgid "SMTP port:"
+msgstr "SMTP ਪੋਰਟ:"
+
+#. TEXT_SETUP_EMAIL_FROM
+msgid "From:"
+msgstr "ਵੱਲੋਂ:"
+
+#. TEXT_SETUP_EMAIL_REPLY_TO
+msgid "Reply to:"
+msgstr "ਜਵਾਬ:"
+
+#. TEXT_SETUP_EMAIL_AUTHENTICATION
+msgid "E-mail authentication"
+msgstr "ਈ-ਮੇਲ ਪਰਮਾਣਕਿਤਾ"
+
+#. TEXT_SETUP_EMAIL_AUTH_USER
+msgid "User:"
+msgstr "ਯੂਜ਼ਰ:"
+
+#. TEXT_SETUP_EMAIL_AUTH_PASS
+msgid "Password:"
+msgstr "ਪਾਸਵਰਡ:"
+
+#. TEXT_SETUP_POP3_SERVER
+msgid "POP3 server:"
+msgstr "POP3 ਸਰਵਰ:"
+
+#. TEXT_SETUP_POP3_PORT
+msgid "POP3 port:"
+msgstr "POP3 ਪੋਰਟ:"
+
+#. TEXT_SETUP_OCR_COMMAND
+msgid "OCR Command:"
+msgstr "OCR ਕਮਾਂਡ:"
+
+#. TEXT_SETUP_OCR_INPUTFILE_OPT
+msgid "Inputfile option:"
+msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਚੋਣ:"
+
+#. TEXT_SETUP_OCR_OUTPUTFILE_OPT
+msgid "Outputfile option:"
+msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ ਚੋਣ:"
+
+#. TEXT_SETUP_OCR_USE_GUI_PIPE_OPT
+msgid "Use GUI progress pipe:"
+msgstr "GUI ਤਰੱਕੀ ਪਾਈਪ ਵਰਤੋਂ:"
+
+#. TEXT_SETUP_OCR_OUTFD_OPT
+msgid "GUI output-fd option:"
+msgstr "GUI output-fd ਚੋਣ:"
+
+#. TEXT_SETUP_OCR_PROGRESS_KEYWORD
+msgid "Progress keyword:"
+msgstr "ਤਰੱਕੀ ਸ਼ਬਦ:"
+
+#. TEXT_SETUP_PERMISSION_USER
+msgid "user"
+msgstr "ਯੂਜ਼ਰ"
+
+#. TEXT_SETUP_PERMISSION_GROUP
+msgid "group"
+msgstr "ਗਰੁੱਪ"
+
+#. TEXT_SETUP_PERMISSION_ALL
+msgid "all"
+msgstr "ਸਭ"
+
+#. TEXT_SETUP_SCANNER_DEFAULT_COLOR_ICM_PROFILE
+#. DESC_SCANNER_DEFAULT_COLOR_ICM_PROFILE
+msgid "Scanner default color ICM-profile"
+msgstr "ਸਕੈਨਰ ਡਿਫਾਲਟ ਕਲਰ ICM-ਪਰੋਫਾਇਲ"
+
+#. TEXT_SETUP_SCANNER_DEFAULT_GRAY_ICM_PROFILE
+#. DESC_SCANNER_DEFAULT_GRAY_ICM_PROFILE
+msgid "Scanner default gray ICM-profile"
+msgstr "ਸਕੈਨਰ ਡਿਫਾਲਟ ਗਰੇ ICM-ਪਰੋਫਾਇਲ"
+
+#. TEXT_SETUP_DISPLAY_ICM_PROFILE
+#. DESC_DISPLAY_ICM_PROFILE
+msgid "Display ICM-profile"
+msgstr "ਡਿਸਪਲੇਅ ICM-ਪਰੋਫਾਇਲ"
+
+#. TEXT_SETUP_CUSTOM_PROOFING_ICM_PROFILE
+#. DESC_CUSTOM_PROOFING_ICM_PROFILE
+msgid "Custom proofing ICM-profile"
+msgstr "ਕਸਟਮ ਪਰੂਫ਼ਿੰਗ ICM-ਪਰੋਫਾਇਲ"
+
+#. TEXT_SETUP_WORKING_COLOR_SPACE_ICM_PROFILE
+#. DESC_WORKING_COLOR_SPACE_ICM_PROFILE
+msgid "Working color space ICM-profile"
+msgstr "ਵਰਕਿੰਗ ਕਲਰ ਸਪੇਸ ICM-ਪਰੋਫਾਇਲ"
+
+#. TEXT_SETUP_PRINTER_ICM_PROFILE
+#. DESC_PRINTER_ICM_PROFILE
+msgid "Printer ICM-profile"
+msgstr "ਪਰਿੰਟਰ ICM-ਪਰੋਫਾਇਲ"
+
+msgid "new media"
+msgstr "ਨਵਾਂ ਮੀਡਿਆ"
+
+#. NOTEBOOK_SAVING_OPTIONS
+#. MENU_ITEM_SAVE
+msgid "Save"
+msgstr "ਸੰਭਾਲੋ"
+
+#. NOTEBOOK_FILETYPE_OPTIONS
+msgid "Filetype"
+msgstr "ਫਾਇਲ ਟਾਈਪ"
+
+#. NOTEBOOK_COPY_OPTIONS
+#. MENU_ITEM_COPY
+msgid "Copy"
+msgstr "ਕਾਪੀ"
+
+#. NOTEBOOK_FAX_OPTIONS
+#. MENU_ITEM_FAX
+msgid "Fax"
+msgstr "ਫੈਕਸ"
+
+#. NOTEBOOK_EMAIL_OPTIONS
+#. MENU_ITEM_EMAIL
+msgid "E-mail"
+msgstr "ਈ-ਮੇਲ"
+
+#. NOTEBOOK_OCR_OPTIONS
+msgid "OCR"
+msgstr "OCR"
+
+#. NOTEBOOK_DISPLAY_OPTIONS
+msgid "Display"
+msgstr "ਡਿਸਪਲੇਅ"
+
+#. NOTEBOOK_ENHANCE_OPTIONS
+msgid "Enhancement"
+msgstr "ਇੰਹਾਂਸਮੈਂਟ"
+
+#. MENU_ITEM_MULTIPAGE
+msgid "Multipage"
+msgstr "ਮਲਟੀ-ਪੇਜ਼"
+
+#. MENU_ITEM_SHOW_TOOLTIPS
+msgid "Show tooltips"
+msgstr "ਟੂਲ-ਟਿੱਪ ਵੇਖੋ"
+
+#. MENU_ITEM_SHOW_PREVIEW
+msgid "Show preview"
+msgstr "ਝਲਕ ਵੇਖੋ"
+
+#. MENU_ITEM_SHOW_HISTOGRAM
+msgid "Show histogram"
+msgstr "ਹਿਸਟੋਗਰਾਮ ਵੇਖੋ"
+
+#. MENU_ITEM_SHOW_GAMMA
+msgid "Show gamma curve"
+msgstr "ਗਾਮਾ ਕਰਵ ਵੇਖੋ"
+
+#. MENU_ITEM_SHOW_BATCH_SCAN
+msgid "Show batch scan"
+msgstr "ਬੈਂਚ ਸਕੈਨ ਵੇਖੋ"
+
+#. MENU_ITEM_SHOW_STANDARDOPTIONS
+msgid "Show standard options"
+msgstr "ਸਟੈਂਡਰਡ ਚੋਣਾਂ ਵੇਖੋ"
+
+#. MENU_ITEM_SHOW_ADVANCEDOPTIONS
+msgid "Show advanced options"
+msgstr "ਤਕਨੀਕੀ ਚੋਣ ਵੇਖੋ"
+
+#. MENU_ITEM_SETUP
+msgid "Setup"
+msgstr "ਸੈੱਟਅੱਪ"
+
+#. MENU_ITEM_LENGTH_UNIT
+msgid "Length unit"
+msgstr "ਲੰਬਾਈ ਯੂਨਿਟ"
+
+#. SUBMENU_ITEM_LENGTH_MILLIMETERS
+msgid "millimeters"
+msgstr "ਮਿਲੀਮੀਟਰ"
+
+#. SUBMENU_ITEM_LENGTH_CENTIMETERS
+msgid "centimeters"
+msgstr "ਸੈਂਟੀਮੀਟਰ"
+
+#. SUBMENU_ITEM_LENGTH_INCHES
+msgid "inches"
+msgstr "ਇੰਚ"
+
+#. MENU_ITEM_UPDATE_POLICY
+msgid "Update policy"
+msgstr "ਅੱਪਡੇਟ ਪਾਲਸੀ"
+
+#. SUBMENU_ITEM_POLICY_CONTINUOUS
+msgid "continuous"
+msgstr "ਜਾਰੀ ਰੱਖੋ"
+
+#. SUBMENU_ITEM_POLICY_DISCONTINU
+msgid "discontinuous"
+msgstr "ਨਾ ਜਾਰੀ ਰੱਖੋ"
+
+#. SUBMENU_ITEM_POLICY_DELAYED
+msgid "delayed"
+msgstr "ਦੇਰੀ"
+
+#. MENU_ITEM_SHOW_RESOLUTIONLIST
+msgid "Show resolution list"
+msgstr "ਰੈਜ਼ੋਲੇਸ਼ਨ ਲਿਸਟ ਵੇਖੋ"
+
+#. MENU_ITEM_PAGE_ROTATE
+msgid "Rotate postscript"
+msgstr "ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਘੁੰਮਾਓ"
+
+#. MENU_ITEM_ENABLE_COLOR_MANAGEMENT
+#. MENU_ITEM_CMS_ENABLE_COLOR_MANAGEMENT
+msgid "Enable color management"
+msgstr "ਰੰਗ ਪਰਬੰਧ ਯੋਗ ਕਰੋ"
+
+#. MENU_ITEM_EDIT_MEDIUM_DEF
+msgid "Edit medium definition"
+msgstr "ਮੀਡਿਅਮ ਪ੍ਰੀਭਾਸ਼ਾ ਸੋਧ"
+
+#. MENU_ITEM_SAVE_DEVICE_SETTINGS
+msgid "Save device settings"
+msgstr "ਜੰਤਰ ਸੈਟਿੰਗ ਸੰਭਾਲੋ"
+
+#. MENU_ITEM_LOAD_DEVICE_SETTINGS
+msgid "Load device settings"
+msgstr "ਜੰਤਰ ਸੈਟਿੰਗ ਲੋਡ ਕਰੋ"
+
+#. MENU_ITEM_CHANGE_WORKING_DIR
+msgid "Change directory"
+msgstr "ਡਾਇਰੈਕਟਰੀ ਬਦਲੋ"
+
+#. MENU_ITEM_XSANE_EULA
+msgid "Show EULA"
+msgstr "EULA ਵੇਖੋ"
+
+#. MENU_ITEM_XSANE_GPL
+msgid "Show license (GPL)"
+msgstr "ਲਾਈਸੈਂਸ ਵੇਖੋ (GPL)"
+
+#. MENU_ITEM_XSANE_DOC
+msgid "XSane doc"
+msgstr "XSane ਦਸਤਾਵੇਜ਼"
+
+#. MENU_ITEM_BACKEND_DOC
+msgid "Backend doc"
+msgstr "ਬੈਕਐਂਡ ਦਸਤਾਵੇਜ਼"
+
+#. MENU_ITEM_AVAILABLE_BACKENDS
+msgid "Available backends"
+msgstr "ਉਪਲੱਬਧ ਬੈਕਐਂਡ"
+
+#. MENU_ITEM_SCANTIPS
+msgid "Scantips"
+msgstr "ਸਕੈਨ-ਟਿੱਪ"
+
+#. MENU_ITEM_PROBLEMS
+msgid "Problems?"
+msgstr "ਸਮੱਸਿਆ?"
+
+#. MENU_ITEM_CMS_PROOFING
+msgid "Proofing"
+msgstr "ਪਰੂਫ਼ਿੰਗ"
+
+#. SUBMENU_ITEM_CMS_PROOF_OFF
+msgid "no proofing (Display)"
+msgstr "ਕੋਈ ਪਰੂਫਿੰਗ ਨਹੀਂ (ਡਿਸਪਲੇਅ)"
+
+#. SUBMENU_ITEM_CMS_PROOF_PRINTER
+msgid "Proof printer"
+msgstr "ਪਰਿੰਟਰ ਪਰੂਫਿੰਗ"
+
+#. SUBMENU_ITEM_CMS_PROOF_CUSTOM
+msgid "Proof custom device"
+msgstr "ਕਸਟਮ ਜੰਤਰ ਪਰੂਫ਼"
+
+#. MENU_ITEM_CMS_RENDERING_INTENT
+msgid "Rendering intent"
+msgstr "ਰੈਂਡਰਿੰਗ ਇੰਟੈਂਟ"
+
+#. MENU_ITEM_CMS_PROOFING_INTENT
+msgid "Proofing rendering intent"
+msgstr "ਪਰੂਫ਼ਿੰਗ ਰੈਂਡਰਿੰਗ ਇੰਟੈਟ"
+
+#. SUBMENU_ITEM_CMS_INTENT_PERCEPTUAL
+msgid "Perceptual"
+msgstr "ਪਰਸੀਪਟੁਲ"
+
+#. SUBMENU_ITEM_CMS_INTENT_RELATIVE_COLORIMETRIC
+msgid "Relative colorimetric"
+msgstr "ਸੰਬੰਧਿਤ ਕਲੋਰੀਮੈਂਟ੍ਰਿਕ"
+
+#. SUBMENU_ITEM_CMS_INTENT_ABSOLUTE_COLORIMETRIC
+msgid "Absolute colorimentric"
+msgstr "ਅਸਲ ਕਲੋਰੀਮੈਂਟ੍ਰਿਕ"
+
+#. SUBMENU_ITEM_CMS_INTENT_SATURATION
+msgid "Saturation"
+msgstr "ਸੰਤ੍ਰਿਪਤ"
+
+#. MENU_ITEM_CMS_GAMUT_CHECK
+msgid "Gamut check"
+msgstr "Gamut ਚੈੱਕ"
+
+#. MENU_ITEM_CMS_GAMUT_ALARM_COLOR
+msgid "Gamut alarm color"
+msgstr "Gamut ਅਲਾਰਮ ਰੰਗ"
+
+#. SUBMENU_ITEM_CMS_COLOR_BLACK
+msgid "Black"
+msgstr "ਕਾਲਾ"
+
+#. SUBMENU_ITEM_CMS_COLOR_GRAY
+msgid "Gray"
+msgstr "ਸਲੇਟੀ"
+
+#. SUBMENU_ITEM_CMS_COLOR_WHITE
+msgid "White"
+msgstr "ਚਿੱਟਾ"
+
+#. SUBMENU_ITEM_CMS_COLOR_RED
+msgid "Red"
+msgstr "ਲਾਲ"
+
+#. SUBMENU_ITEM_CMS_COLOR_GREEN
+msgid "Green"
+msgstr "ਹਰਾ"
+
+#. SUBMENU_ITEM_CMS_COLOR_BLUE
+msgid "Blue"
+msgstr "ਨੀਲਾ"
+
+#. MENU_ITEM_COUNTER_LEN_INACTIVE
+msgid "inactive"
+msgstr "ਇਨ-ਐਕਟਿਵ"
+
+#. MENU_ITEM_TIFF_COMP_NONE
+msgid "no compression"
+msgstr "ਕੰਪਰੈਸ਼ਨ ਨਹੀਂ"
+
+#. MENU_ITEM_TIFF_COMP_CCITTRLE
+msgid "CCITT 1D Huffman compression"
+msgstr "CCITT 1D Huffman ਕੰਪਰੈਸ਼ਨ"
+
+#. MENU_ITEM_TIFF_COMP_CCITFAX3
+msgid "CCITT Group 3 fax compression"
+msgstr "CCITT ਗਰੁੱਪ 3 ਫੈਕਸ ਕੰਪਰੈਸ਼ਨ"
+
+#. MENU_ITEM_TIFF_COMP_CCITFAX4
+msgid "CCITT Group 4 fax compression"
+msgstr "CCITT ਗਰੁੱਪ 4 ਫੈਕਸ ਕੰਪਰੈਸ਼ਨ"
+
+#. MENU_ITEM_TIFF_COMP_JPEG
+msgid "JPEG DCT compression"
+msgstr "JPEG DCT ਕੰਪਰੈਸ਼ਨ"
+
+#. MENU_ITEM_TIFF_COMP_PACKBITS
+msgid "pack bits"
+msgstr "ਪੈਕ ਬਿੱਟ"
+
+#. MENU_ITEM_TIFF_COMP_DEFLATE
+msgid "deflate"
+msgstr "deflate"
+
+#. MENU_ITEM_RANGE_SCALE
+msgid "Slider (Scale)"
+msgstr "ਸਲਾਇਡਰ (ਸਕੇਲ)"
+
+#. MENU_ITEM_RANGE_SCROLLBAR
+msgid "Slider (Scrollbar)"
+msgstr "ਸਲਾਇਡਰ (ਸਕਰੋਲਬਾਰ)"
+
+#. MENU_ITEM_RANGE_SPINBUTTON
+msgid "Spinbutton"
+msgstr "ਸਪਿੰਨ-ਬਟਨ"
+
+#. MENU_ITEM_RANGE_SCALE_SPIN
+msgid "Scale and Spinbutton"
+msgstr "ਸਕੇਲ ਅਤੇ ਸਪਿੰਨ ਬਟਨ"
+
+#. MENU_ITEM_RANGE_SCROLL_SPIN
+msgid "Scrollbar and Spinbutton"
+msgstr "ਸਕਰੋਲ-ਬਾਰ ਅਤੇ ਸਪਿਨ-ਬਟਨ"
+
+#. MENU_ITEM_LINEART_MODE_STANDARD
+msgid "Standard options window (lineart)"
+msgstr "ਸਟੈਂਡਰਡ ਚੋਣ ਵਿੰਡੋ (ਲੀਨੀਅਰਟ)"
+
+#. MENU_ITEM_LINEART_MODE_XSANE
+msgid "XSane main window (lineart)"
+msgstr "XSane ਮੇਨ ਵਿੰਡੋ (ਲੀਨੀਅਰਟ)"
+
+#. MENU_ITEM_LINEART_MODE_GRAY
+msgid "XSane main window (grayscale->lineart)"
+msgstr "XSane ਮੇਨ ਵਿੰਡੋ (grayscale->lineart)"
+
+#. MENU_ITEM_SELECTION_NONE
+msgid "(none)"
+msgstr "(ਕੋਈ ਨਹੀਂ)"
+
+#. MENU_ITEM_FILETYPE_BY_EXT
+msgid "by ext"
+msgstr "ext ਨਾਲ"
+
+#. MENU_ITEM_PRESET_AREA_ADD_SEL
+msgid "Add selection to list"
+msgstr "ਚੋਣ ਲਿਸਟ 'ਚ ਸ਼ਾਮਲ"
+
+#. MENU_ITEM_MEDIUM_ADD
+msgid "Add medium definition"
+msgstr "ਮੀਡਿਅਮ ਪਰਿਭਾਸ਼ਾ ਸ਼ਾਮਲ"
+
+#. MENU_ITEM_RENAME
+msgid "Rename item"
+msgstr "ਆਈਟਮ ਨਾਂ ਬਦਲੋ"
+
+#. MENU_ITEM_DELETE
+msgid "Delete item"
+msgstr "ਆਈਟਮ ਹਟਾਓ"
+
+#. MENU_ITEM_MOVE_UP
+msgid "Move item up"
+msgstr "ਆਈਟਮ ਉੱਤੇ ਭੇਜੋ"
+
+#. MENU_ITEM_MOVE_DWN
+msgid "Move item down"
+msgstr "ਆਈਟਮ ਹੇਠਾਂ ਭੇਜੋ"
+
+#. MENU_ITEM_AUTH_NONE
+msgid "no authentication"
+msgstr "ਕੋਈ ਪਰਮਾਣਕਿਤਾ ਨਹੀਂ"
+
+#. MENU_ITEM_AUTH_POP3
+msgid "POP3 before SMTP"
+msgstr "SMTP ਤੋਂ ਪਹਿਲਾਂ POP3"
+
+#. MENU_ITEM_AUTH_ASMTP_PLAIN
+msgid "ASMTP Plain"
+msgstr "ASMTP ਪਲੇਨ"
+
+#. MENU_ITEM_AUTH_ASMTP_LOGIN
+msgid "ASMTP Login"
+msgstr "ASMTP ਲਾਗਇਨ"
+
+#. MENU_ITEM_AUTH_ASMTP_CRAM_MD5
+msgid "ASMTP CRAM-MD5"
+msgstr "ASMTP CRAM-MD5"
+
+#. MENU_ITEM_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE
+msgid "Embed scanner ICM profile"
+msgstr "ਇੰਬੈੱਡ ਸਕੈਨਰ ICM ਪਰੋਫਾਇਲ"
+
+#. MENU_ITEM_CMS_FUNCTION_CONVERT_TO_SRGB
+msgid "Convert to sRGB"
+msgstr "sRGB ਲਈ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. MENU_ITEM_FUNCTION_CONVERT_TO_WORKING_CS
+msgid "Convert to working color space"
+msgstr "ਵਰਕਿੰਗ ਕਲਰ ਸਪੇਸ ਬਦਲੀ ਜਾ ਰਹੀ ਹੈ"
+
+#. PROGRESS_SCANNING
+msgid "Scanning"
+msgstr "ਸਕੈਨ ਕੀਤਾ ਰਿਹਾ ਹੈ"
+
+#. PROGRESS_RECEIVING_FRAME_DATA
+#, c-format
+msgid "Receiving %s data"
+msgstr "%s ਡਾਟਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. PROGRESS_PAGE
+msgid "page"
+msgstr "ਪੇਜ਼"
+
+#. PROGRESS_TRANSFERRING_DATA
+msgid "Transferring image"
+msgstr "ਚਿੱਤਰ ਟਰਾਂਸਫਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. PROGRESS_ROTATING_DATA
+msgid "Rotating image"
+msgstr "ਚਿੱਤਰ ਘੁੰਮਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. PROGRESS_MIRRORING_DATA
+msgid "Mirroring image"
+msgstr "ਚਿੱਤਰ ਮਿੱਰਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. PROGRESS_PACKING_DATA
+msgid "Packing image"
+msgstr "ਚਿੱਤਰ ਪੈਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. PROGRESS_CONVERTING_DATA
+msgid "Converting image"
+msgstr "ਚਿੱਤਰ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. PROGRESS_SAVING_DATA
+msgid "Saving image"
+msgstr "ਚਿੱਤਰ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. PROGRESS_CLONING_DATA
+msgid "Cloning image"
+msgstr "ਚਿੱਤਰ ਕਲੋਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. PROGRESS_SCALING_DATA
+msgid "Scaling image"
+msgstr "ਚਿੱਤਰ ਸਕੇਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. PROGRESS_DESPECKLING_DATA
+msgid "Despeckling image"
+msgstr "ਚਿੱਤਰ ਡਿਸਪਿਕਲਿੰਗ"
+
+#. PROGRESS_BLURING_DATA
+msgid "Bluring image"
+msgstr "ਚਿੱਤਰ ਬਲੁਰਿੰਗ"
+
+#. PROGRESS_OCR
+msgid "OCR in progress"
+msgstr "OCR ਜਾਰੀ ਹੈ"
+
+#. PROGRESS_ICM_CONVERSION
+msgid "converting colors"
+msgstr "ਰੰਗ ਬਦਲੇ ਜਾ ਰਹੇ ਹਨ"
+
+#. DESC_SCAN_START
+msgid "Start scan <Ctrl-Enter>"
+msgstr "ਸਕੈਨ ਚਾਲੂ ਕਰੋ <Ctrl-Enter>"
+
+#. DESC_SCAN_CANCEL
+msgid "Cancel scan <ESC>"
+msgstr "ਸਕੈਲ ਰੱਦ ਕਰੋ <ESC>"
+
+#. DESC_PREVIEW_ACQUIRE
+msgid "Acquire preview scan <Alt-p>"
+msgstr "ਸਕੈਨ ਝਲਕ ਲਵੋ <Alt-p>"
+
+#. DESC_PREVIEW_CANCEL
+msgid "Cancel preview scan <Alt-ESC>"
+msgstr "ਸਕੈਨ ਝਲਕ ਰੱਦ ਕਰੋ <Alt-ESC>"
+
+#. DESC_XSANE_MODE
+msgid ""
+"viewer-<Ctrl-v>, save-<Ctrl-s>, photocopy-<Ctrl-c>, multipage-<Ctrl-m>, fax-"
+"<Ctrl-f> or e-mail-<Ctrl-e>"
+msgstr ""
+"viewer-<Ctrl-v>, save-<Ctrl-s>, photocopy-<Ctrl-c>, multipage-<Ctrl-m>, fax-"
+"<Ctrl-f> or e-mail-<Ctrl-e>"
+
+#. DESC_XSANE_MEDIUM
+msgid ""
+"Select source medium type.\n"
+"To rename, reorder or delete an entry use context menu (alternate mouse "
+"button).\n"
+"To create a medium enable the option edit medium definition in preferences "
+"menu."
+msgstr ""
+"ਸਰੋਤ ਮੀਡਿਅਮ ਟਾਈਪ ਚੁਣੋ।\n"
+"ਇੱਕ ਐਂਟਰੀ ਦਾ ਨਾਂ ਬਦਲਣ, ਰੀ-ਆਰਡਰ ਕਰਨ ਜਾਂ ਹਟਾਉਣ ਵਾਸਤੇ ਮੇਨੂ ਵਰਤੋਂ (ਬਦਲਵੇਂ ਰੂਪ ਵਿੱਚ ਮਾਊਂਸ ਬਟਨ)"
+"।\n"
+"ਇੱਕ ਮੀਡਿਅਮ ਬਣਾਉਣ ਵਾਸਤੇ ਪਸੰਦ ਮੇਨੂ ਵਿੱਚ ਮੀਡਿਅਮ ਪਰਿਭਾਸ਼ਾ ਸੋਧ ਚੋਣ ਯੋਗ ਕਰੋ।"
+
+#. DESC_FILENAME_COUNTER_STEP
+msgid "Value that is added to filenamecounter after scan"
+msgstr "ਸਕੈਨ ਕਰਨ ਬਾਅਦ ਫਾਇਲ-ਨਾਂ-ਕਾਊਂਟਰ ਲਈ ਜੋੜਨ ਵਾਸਤੇ ਮੁੱਲ"
+
+#. DESC_BROWSE_FILENAME
+msgid "Browse for image filename"
+msgstr "ਚਿੱਤਰ ਫਾਇਲ ਨਾਂ ਲਈ ਝਲਕ"
+
+#. DESC_FILENAME
+msgid "Filename for scanned image"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਚਿੱਤਰਾਂ ਲਈ ਫਾਇਲ ਨਾਂ"
+
+#. DESC_FILETYPE
+msgid ""
+"Type of image format, the suitable filename extension is automatically added "
+"to the filename"
+msgstr "ਚਿੱਤਰ ਫਾਇਲ ਕਿਸਮ, ਫਾਇਲ ਨਾਂ ਵਿੱਚ ਫਾਇਲ-ਨਾਂ ਐਕਸ਼ਟੇਸ਼ਨ ਨੂੰ ਆਟੋਮੈਟਿਕ ਹੀ ਜੋੜ ਦਿੱਤਾ ਜਾਵੇਗਾ"
+
+#. DESC_FAXPROJECT
+msgid "Enter fax project directory name"
+msgstr "ਫੈਕਸ ਪ੍ਰੋਜੈਕਟ ਡਾਇਰੈਕਟਰੀ ਨਾਂ ਦਿਓ"
+
+#. DESC_FAXPAGENAME
+msgid "Enter new name for faxpage"
+msgstr "ਫੈਕਸ-ਸਫ਼ੇ ਲਈ ਨਵਾਂ ਨਾਂ ਦਿਓ ਜੀ"
+
+#. DESC_FAXRECEIVER
+msgid "Enter receiver phone number or address"
+msgstr "ਰਿਸੀਵਰ ਫੋਨ ਨਾਂ ਜਾਂ ਐਡਰੈੱਸ ਦਿਓ"
+
+#. DESC_FAX_PROJECT_BROWSE
+msgid "Browse for fax project directory"
+msgstr "ਫੈਕਸ ਪ੍ਰੋਜੈਕਟ ਡਾਇਰੈਕਟਰੀ ਲਈ ਝਲਕ"
+
+#. DESC_EMAIL_PROJECT
+msgid "Enter e-mail project directory name"
+msgstr "ਈਮੇਲ ਪ੍ਰੋਜੈਕਟ ਡਾਇਰੈਕਟਰੀ ਨਾਂ ਦਿਓ"
+
+#. DESC_EMAIL_IMAGENAME
+msgid "Enter new name for e-mail image"
+msgstr "ਈਮੇਲ ਚਿੱਤਰ ਲਈ ਨਵਾਂ ਨਾਂ ਦਿਓ"
+
+#. DESC_EMAIL_RECEIVER
+msgid "Enter e-mail address"
+msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ"
+
+#. DESC_EMAIL_PROJECT_BROWSE
+msgid "Browse for email project directory"
+msgstr "ਈਮੇਮ ਪ੍ਰੋਜੈਕਟ ਡਾਇਰੈਕਟਰੀ ਲਈ ਝਲਕ"
+
+#. DESC_EMAIL_SUBJECT
+msgid "Enter subject of e-mail"
+msgstr "ਈਮੇਲ ਲਈ ਵਿਸ਼ਾ ਦਿਓ ਜੀ"
+
+#. DESC_EMAIL_FILETYPE
+msgid "Select filetype for image attachments"
+msgstr "ਚਿੱਤਰ ਅਟੈਂਚਮਿੰਟ ਲਈ ਫਾਇਲ ਕਿਸਮ ਚੁਣੋ"
+
+#. DESC_MULTIPAGE_PROJECT
+msgid "Enter multipage project directory name"
+msgstr "ਮਲਟੀ-ਪੇਜ਼ ਪ੍ਰੋਜੈਕਟ ਡਾਇਰੈਕਟਰੀ ਨਾਂ ਦਿਓ"
+
+#. DESC_MULTIPAGE_PROJECT_BROWSE
+msgid "Browse for multipage project directory"
+msgstr "ਮਲਟੀ-ਪੇਜ਼ ਪ੍ਰੋਜੈਕਟ ਡਾਇਰੈਕਟਰੀ ਲਈ ਝਲਕ"
+
+#. DESC_MULTIPAGE_FILETYPE
+msgid "Select filetype for multipage file"
+msgstr "ਮਲਟੀ-ਪੇਜ਼ ਫਾਇਲ ਲਈ ਫਾਇਲ-ਕਿਸਮ ਚੁਣੋ"
+
+#. DESC_PRESET_AREA_RENAME
+msgid "Enter new name for preset area"
+msgstr "ਪ੍ਰੀ-ਸੈੱਟ ਏਰੀਏ ਲਈ ਨਵਾਂ ਨਾਂ ਦਿਓ"
+
+#. DESC_PRESET_AREA_ADD
+msgid "Enter name for new preset area"
+msgstr "ਨਵੇਂ ਪ੍ਰੀ-ਸੈੱਟ ਏਰੀਏ ਲਈ ਨਾਂ ਦਿਓ"
+
+#. DESC_MEDIUM_RENAME
+msgid "Enter new name for medium definition"
+msgstr "ਮੀਡਿਆ ਪ੍ਰੀਭਾਸ਼ਾ ਲਈ ਨਵਾਂ ਨਾਂ ਦਿਓ"
+
+#. DESC_MEDIUM_ADD
+msgid "Enter name for new medium definition"
+msgstr "ਨਵੇਂ ਮੀਡਿਆ ਪ੍ਰੀਭਾਸ਼ਾ ਲਈ ਨਾਂ ਦਿਓ"
+
+#. DESC_PRINTER_SELECT
+msgid "Select printerdefinition <Shift-F1/F2/...>"
+msgstr "ਪਰਿੰਟਰ-ਪ੍ਰੀਭਾਸ਼ਾ ਚੁਣੋ <Shift-F1/F2/...>"
+
+#. DESC_RESOLUTION
+msgid "Set scan resolution"
+msgstr "ਸਕੈਨ ਰੈਜ਼ੋਲੇਸ਼ਨ ਸੈੱਟ ਕਰੋ"
+
+#. DESC_RESOLUTION_X
+msgid "Set scan resolution for x direction"
+msgstr "x ਦਿਸ਼ਾ ਲਈ ਸਕੈਨ ਰੈਜ਼ੋਲੇਸ਼ਨ ਦਿਓ"
+
+#. DESC_RESOLUTION_Y
+msgid "Set scan resolution for y direction"
+msgstr "y ਦਿਸ਼ਾ ਲਈ ਸਕੈਨ ਰੈਜ਼ੋਲੇਸ਼ਨ ਦਿਓ"
+
+#. DESC_ZOOM
+msgid "Set zoomfactor"
+msgstr "ਜ਼ੂਮ-ਫੈਕਟਰ ਦਿਓ"
+
+#. DESC_ZOOM_X
+msgid "Set zoomfactor for x direction"
+msgstr "x ਦਿਸ਼ਾ ਲਈ ਜ਼ੂਮ-ਫੈਕਟਰ ਦਿਓ"
+
+#. DESC_ZOOM_Y
+msgid "Set zoomfactor for y direction"
+msgstr "y ਦਿਸ਼ਾ ਲਈ ਜ਼ੂਮ-ਫੈਕਟਰ ਦਿਓ"
+
+#. DESC_COPY_NUMBER
+msgid "Set number of copies"
+msgstr "ਕਾਪੀਆਂ ਦੀ ਗਿਣਤੀ ਸੈੱਟ ਕਰੋ"
+
+#. DESC_NEGATIVE
+msgid "Negative: Invert colors for scanning negatives <Ctrl-n>"
+msgstr "ਨੈਗਟਿਵ: ਸਕੈਨਿੰਗ ਨੈਗਟਿਵ ਲਈ ਉਲਟ ਰੰਗ <Ctrl-n>"
+
+#. DESC_GAMMA
+msgid "Set gamma value"
+msgstr "ਗਾਮਾ ਮੁੱਲ ਦਿਓ"
+
+#. DESC_GAMMA_R
+msgid "Set gamma value for red component"
+msgstr "ਲਾਲ ਭਾਗ ਲਈ ਗਾਮਾ ਮੁੱਲ ਦਿਓ"
+
+#. DESC_GAMMA_G
+msgid "Set gamma value for green component"
+msgstr "ਹਰੇ ਭਾਗ ਲਈ ਗਾਮਾ ਮੁੱਲ ਦਿਓ"
+
+#. DESC_GAMMA_B
+msgid "Set gamma value for blue component"
+msgstr "ਨੀਲੇ ਭਾਗ ਲਈ ਗਾਮਾ ਮੁੱਲ ਦਿਓ"
+
+#. DESC_BRIGHTNESS
+msgid "Set brightness"
+msgstr "ਚਮਕ ਦਿਓ"
+
+#. DESC_BRIGHTNESS_R
+msgid "Set brightness for red component"
+msgstr "ਲਾਲ ਭਾਗ ਲਈ ਚਮਕ ਦਿਓ"
+
+#. DESC_BRIGHTNESS_G
+msgid "Set brightness for green component"
+msgstr "ਹਰੇ ਭਾਗ ਲਈ ਚਮਕ ਦਿਓ"
+
+#. DESC_BRIGHTNESS_B
+msgid "Set brightness for blue component"
+msgstr "ਨੀਲੇ ਲਈ ਚਮਕ ਦਿਓ"
+
+#. DESC_CONTRAST
+msgid "Set contrast"
+msgstr "ਕਨਟਰਾਸਟ ਸੈੱਟ ਕਰੋ"
+
+#. DESC_CONTRAST_R
+msgid "Set contrast for red component"
+msgstr "ਲਾਲ ਭਾਗ ਲਈ ਕਨਟਰਾਸਟ ਸੈੱਟ ਕਰੋ"
+
+#. DESC_CONTRAST_G
+msgid "Set contrast for green component"
+msgstr "ਹਰੇ ਭਾਗ ਲਈ ਕਨਟਰਾਸਟ ਸੈੱਟ ਕਰੋ"
+
+#. DESC_CONTRAST_B
+msgid "Set contrast for blue component"
+msgstr "ਨੀਲੇ ਭਾਗ ਲਈ ਕਨਟਰਾਸਟ ਸੈੱਟ ਕਰੋ"
+
+#. DESC_THRESHOLD
+msgid "Set threshold"
+msgstr "ਥਰੈਂਸ਼ਹੋਲਡ ਦਿਓ"
+
+#. DESC_RGB_DEFAULT
+msgid ""
+"RGB default: Set enhancement values for red, green and blue to default "
+"values <Ctrl-b>:\n"
+" gamma = 1.0\n"
+" brightness = 0\n"
+" contrast = 0"
+msgstr ""
+"RGB ਡਿਫਾਲਟ: ਲਾਲ, ਹਰੇ ਅਤੇ ਨੀਲੇ ਲਈ ਇੰਹਾਂਸਡ ਮੁੱਲ ਨੂੰ ਡਿਫਾਲਟ ਸੈੱਟ ਕਰੋ<Ctrl-b>:\n"
+" ਗਾਮਾ = 1.0\n"
+" ਚਮਕ = 0\n"
+" ਕਨਟਰਾਸਟ = 0"
+
+#. DESC_ENH_AUTO
+msgid "Autoadjust gamma, brightness and contrast <Ctrl-a>"
+msgstr "ਗਾਮਾ, ਚਮਕ ਅਤੇ ਕਨਟਰਾਸਟ ਆਟੋ-ਅਨੁਕੂਲ ਕਰੋ <Ctrl-a>"
+
+#. DESC_ENH_DEFAULT
+msgid ""
+"Set default enhancement values <Ctrl-0>:\n"
+"gamma = 1.0\n"
+"brightness = 0\n"
+"contrast = 0"
+msgstr ""
+"ਡਿਫਾਲਟ ਇੰਹਾਂਸਮੈਂਟ ਮੁੱਲ ਸੈੱਟ ਕਰੋ <Ctrl-0>:\n"
+"ਗਾਮਾ = 1.0\n"
+"ਬਰਾਈਟਨੈੱਸ = 0\n"
+"ਕਨਟਰਾਸਟ = 0"
+
+#. DESC_ENH_RESTORE
+msgid "Restore enhancement values from preferences <Ctrl-r>"
+msgstr "ਪਸੰਦ ਤੋਂ ਇੰਹਾਂਸਡ ਮੁੱਲ ਰੀ-ਸਟੋਰ ਕਰੋ <Ctrl-r>"
+
+#. DESC_ENH_STORE
+msgid "Store active enhancement values to preferences <Ctrl-+>"
+msgstr "ਐਕਟਿਵ ਇੰਹਾਂਸਡ ਮੁੱਲ ਪਸੰਦ ਵਿੱਚ ਸਟੋਰ ਕਰੋ <Ctrl-+>"
+
+#. DESC_HIST_INTENSITY
+msgid "Show histogram of intensity/gray <Alt-i>"
+msgstr "ਇੰਟੈਂਸਟੀ/ਗਰੇ ਲਈ ਹਿਸਟੋਗਰਾਮ ਵੇਖੋ <Alt-i>"
+
+#. DESC_HIST_RED
+msgid "Show histogram of red component <Alt-r>"
+msgstr "ਲਾਲ ਭਾਗ ਲਈ ਹਿਸਟੋਗਰਾਮ ਵੇਖੋ <Alt-r>"
+
+#. DESC_HIST_GREEN
+msgid "Show histogram of green component <Alt-g>"
+msgstr "ਹਰੇ ਭਾਗ ਲਈ ਹਿਸਟੋਗਰਾਮ ਵੇਖੋ <Alt-g>"
+
+#. DESC_HIST_BLUE
+msgid "Show histogram of blue component <Alt-b>"
+msgstr "ਨੀਲੇ ਭਾਗ ਲਈ ਹਿਸਟੋਗਰਾਮ ਵੇਖੋ <Alt-b>"
+
+#. DESC_HIST_PIXEL
+msgid "Display mode: show histogram with lines instead of pixels <Alt-m>"
+msgstr "ਡਿਸਪਲੇਅ ਮੋਡ: ਪਿਕਸਲਾਂ ਦੀ ਬਜਾਏ ਲਾਈਨਾਂ ਨਾਲ ਹਿਸਟੋਗਰਾਮ ਵੇਖੋ <Alt-m>"
+
+#. DESC_HIST_LOG
+msgid "Show logarithm of pixelcount <Alt-l>"
+msgstr "ਪਿਕਸਲ-ਗਿਣਤੀ ਦਾ ਲਾਗਰਥਿਮ ਵੇਖੋ <Alt-l>"
+
+#. DESC_PRINTER_SETUP
+msgid "Select definition to change"
+msgstr "ਬਦਲਣ ਲਈ ਪਰਿਭਾਸ਼ਾ ਚੁਣੋ"
+
+#. DESC_PRINTER_NAME
+msgid "Define a name for the selection of this definition"
+msgstr "ਇਹ ਪ੍ਰੀਭਾਸ਼ਾ ਦੀ ਚੋਣ ਵਾਸਤੇ ਨਾਂ ਦਿਓ"
+
+#. DESC_PRINTER_COMMAND
+msgid "Enter command to be executed in copy mode (e.g. \"lpr\")"
+msgstr "ਕਾਪੀ ਮੋਡ ਵਿੱਚ ਚਲਾਉਣ ਲਈ ਕਮਾਂਡ ਦਿਓ (ਜਿਵੇਂ ਕਿ \"lpr\")"
+
+#. DESC_COPY_NUMBER_OPTION
+msgid "Enter option for copy numbers"
+msgstr "ਕਾਪੀ ਗਿਣਤੀ ਲਈ ਚੋਣ ਦਿਓ"
+
+#. DESC_PRINTER_LINEART_RESOLUTION
+msgid ""
+"Resolution with which lineart images are printed and saved in postscript"
+msgstr "ਰੈਜ਼ੋਲੂਸ਼ਨ, ਜਿਸ ਨਾਲ ਲੀਨੀਅਰ ਚਿੱਤਰ ਪਰਿੰਟ ਕੀਤੇ ਜਾਣਗੇ ਅਤੇ ਪੋਸਟਸਕ੍ਰਿਪਟ ਵਿੱਚ ਸੰਭਾਲੇ ਜਾਣਗੇ"
+
+#. DESC_PRINTER_GRAYSCALE_RESOLUTION
+msgid ""
+"Resolution with which grayscale images are printed and saved in postscript"
+msgstr "ਰੈਜ਼ੋਲੂਸ਼ਨ, ਜਿਸ ਨਾਲ ਗਰੇਸਕੇਲ ਚਿੱਤਰ ਪਰਿੰਟ ਕੀਤੇ ਜਾਣਗੇ ਅਤੇ ਪੋਸਟਸਕ੍ਰਿਪਟ ਵਿੱਚ ਸੰਭਾਲੇ ਜਾਣਗੇ"
+
+#. DESC_PRINTER_COLOR_RESOLUTION
+msgid "Resolution with which color images are printed and saved in postscript"
+msgstr "ਰੈਜ਼ੋਲੂਸ਼ਨ, ਜਿਸ ਨਾਲ ਕਲਰ ਚਿੱਤਰ ਪਰਿੰਟ ਕੀਤੇ ਜਾਣਗੇ ਅਤੇ ਪੋਸਟਸਕ੍ਰਿਪਟ ਵਿੱਚ ਸੰਭਾਲੇ ਜਾਣਗੇ"
+
+#. DESC_PRINTER_WIDTH
+#. DESC_FAX_WIDTH
+msgid "Width of printable area"
+msgstr "ਪਰਿੰਟ-ਯੋਗ ਖੇਤਰ ਦੀ ਚੌੜਾਈ"
+
+#. DESC_PRINTER_HEIGHT
+#. DESC_FAX_HEIGHT
+msgid "Height of printable area"
+msgstr "ਪਰਿੰਟ-ਯੋਗ ਖੇਤਰ ਦੀ ਉਚਾਈ"
+
+#. DESC_PRINTER_LEFTOFFSET
+#. DESC_FAX_LEFTOFFSET
+msgid "Left offset from the edge of the paper to the printable area"
+msgstr "ਪਰਿੰਟ-ਯੋਗ ਏਰੀਏ ਤੋਂ ਪੇਪਰ ਦੇ ਕੋਨੇ ਤੋਂ ਖੱਬਾ ਆਫਸੈੱਟ"
+
+#. DESC_PRINTER_BOTTOMOFFSET
+#. DESC_FAX_BOTTOMOFFSET
+msgid "Bottom offset from the edge of the paper to the printable area"
+msgstr "ਪਰਿੰਟ-ਯੋਗ ਏਰੀਏ ਤੋਂ ਪੇਪਰ ਦੇ ਕੋਨੇ ਤੋਂ ਤਲ ਆਫਸੈੱਟ"
+
+#. DESC_PRINTER_GAMMA
+msgid "Additional gamma value for photocopy"
+msgstr "ਫੋਟੋ-ਕਾਪੀ ਲਈ ਹੋਰ ਗਾਮਾ ਮੁੱਲ"
+
+#. DESC_PRINTER_GAMMA_RED
+msgid "Additional gamma value for red component for photocopy"
+msgstr "ਫੋਟੋ-ਕਾਪੀ ਲਈ ਲਾਲ ਭਾਗ ਵਾਸਤੇ ਹੋਰ ਗਾਮਾ ਮੁੱਲ"
+
+#. DESC_PRINTER_GAMMA_GREEN
+msgid "Additional gamma value for green component for photocopy"
+msgstr "ਫੋਟੋ-ਕਾਪੀ ਲਈ ਹਰੇ ਭਾਗ ਵਾਸਤੇ ਹੋਰ ਗਾਮਾ ਮੁੱਲ"
+
+#. DESC_PRINTER_GAMMA_BLUE
+msgid "Additional gamma value for blue component for photocopy"
+msgstr "ਫੋਟੋ-ਕਾਪੀ ਲਈ ਨੀਲੇ ਭਾਗ ਵਾਸਤੇ ਹੋਰ ਗਾਮਾ ਮੁੱਲ"
+
+#. DESC_PRINTER_EMBED_CSA
+msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
+msgstr "ਇੱਕ ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਬਣਾਓ, ਜੋ ਕਿ ਸਕੈਨਰ ਦਾ ICM ਪਰੋਫਾਇਲ ਰੱਖਦੀ ਹੋਵੇ।"
+
+#. DESC_PRINTER_EMBED_CRD
+msgid "Creates a postsciptfile that contains the ICM profile of the printer"
+msgstr "ਇੱਕ ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਬਣਾਓ, ਜੋ ਕਿ ਪਰਿੰਟਰ ਦਾ ICM ਪਰੋਫਾਇਲ ਰੱਖਦੀ ਹੋਵੇ।"
+
+#. DESC_PRINTER_CMS_BPC
+msgid "Applies black point compensation"
+msgstr "ਕਾਲਾ ਪੁਆਇੰਟ ਕੰਪਨਸੇਸ਼ਨ ਲਾਗੂ ਕਰੋ"
+
+#. DESC_PRINTER_PS_FLATEDECODED
+msgid ""
+"Create zlib compressed postscript image for printer (flatedecode).\n"
+"The printer has to understand postscript level 3!"
+msgstr ""
+"ਪਰਿੰਟਰ (flatedecode) ਲਈ zlib ਕੰਪਰੈੱਸਡ ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਬਣਾਓ।\n"
+"ਪਰਿੰਟਰ ਵਲੋਂ ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਲੈਵਲ 3 ਬਾਰੇ ਜਾਣਕਾਰੀ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ!"
+
+#. DESC_TMP_PATH
+msgid "Path to temp directory"
+msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਲਈ ਮਾਰਗ"
+
+#. DESC_BUTTON_TMP_PATH_BROWSE
+msgid "Browse for temporary directory"
+msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਲਈ ਝਲਕ"
+
+#. DESC_JPEG_QUALITY
+msgid ""
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
+msgstr "ਜੇਤ ਚਿੱਤਰ ਨੂੰ JPEG ਜਾਂ TIFF ਨਾਲ JPEG ਕੰਪਰੈਸ਼ਨ ਵਾਂਗ ਸੰਭਾਲਿਆ ਜਾਵੇ ਤਾਂ ਕੁਆਲਟੀ ਫੀਸਦੀ"
+
+#. DESC_PNG_COMPRESSION
+msgid "Compression if image is saved as PNG"
+msgstr "ਜੇ ਚਿੱਤਰ ਨੂੰ PNG ਦੇ ਤੌਰ ਉੱਤੇ ਸੰਭਾਲਿਆ ਜਾਵੇ ਤਾਂ ਕੰਪਰੈੱਸ ਕਰੋ"
+
+#. DESC_FILENAME_COUNTER_LEN
+msgid "Minimum length of counter in filename"
+msgstr "ਫਾਇਲ ਨਾਂ ਵਿੱਚ ਕਾਊਂਟਰ ਦੀ ਘੱਟੋ-ਘੱਟ ਲੰਬਾਈ"
+
+#. DESC_TIFF_ZIP_COMPRESSION
+msgid "Compression rate for zip compressed TIFF (deflate)"
+msgstr "ਜ਼ਿੱਪ (zip) ਕੰਪਰੈੱਸ TIFF ਲਈ ਕੰਪਰੈਸ਼ਨ ਰੇਟ (deflate)"
+
+#. DESC_TIFF_COMPRESSION_16
+msgid "Compression type if 16 bit image is saved as TIFF"
+msgstr "ਜੇ 16 ਬਿੱਟ ਚਿੱਤਰ ਨੂੰ TIFF ਵਾਂਗ ਸੰਭਾਲਣ ਹੋਵੇ ਤਾਂ ਕੰਪਰੈੱਸਨ ਕਿਸਮ"
+
+#. DESC_TIFF_COMPRESSION_8
+msgid "Compression type if 8 bit image is saved as TIFF"
+msgstr "ਜੇ 8 ਬਿੱਟ ਚਿੱਤਰ ਨੂੰ TIFF ਵਾਂਗ ਸੰਭਾਲਣ ਹੋਵੇ ਤਾਂ ਕੰਪਰੈੱਸਨ ਕਿਸਮ"
+
+#. DESC_TIFF_COMPRESSION_1
+msgid "Compression type if lineart image is saved as TIFF"
+msgstr "ਜੇ ਲੀਨੀਅਰਟ ਚਿੱਤਰ ਨੂੰ TIFF ਵਾਂਗ ਸੰਭਾਲਣ ਹੋਵੇ ਤਾਂ ਕੰਪਰੈੱਸਨ ਕਿਸਮ"
+
+#. DESC_SAVE_DEVPREFS_AT_EXIT
+msgid "Save device dependant preferences in default file at exit of xsane"
+msgstr "xsane ਬੰਦ ਕਰਨ ਸਮੇਂ ਡਿਫਾਲਟ ਫਾਇਲ ਵਿੱਚ ਜੰਤਰ ਨਿਰਭਰਤਾ ਪਸੰਦ ਸੰਭਾਲੋ"
+
+#. DESC_OVERWRITE_WARNING
+msgid "Warn before overwriting an existing file"
+msgstr "ਇੱਕ ਮੌਜੂਦਾ ਫਾਇਲ ਉੱਤੇ ਲਿਖਣ ਤੋਂ ਪਹਿਲਾਂ ਚੇਤਾਵਨੀ ਦਿਓ"
+
+#. DESC_SKIP_EXISTING
+msgid ""
+"If filename counter is automatically increased, used numbers are skipped"
+msgstr "ਜੇ ਫਾਇਲ-ਨਾਂ ਕਾਊਂਟਰ ਨੂੰ ਆਟੋਮੈਟਿਕ ਵਧਾਉਣਾ ਹੋਵੇ ਤਾਂ ਵਰਤੇ ਨੰਬਰ ਛੱਡੇ ਜਾਣਗੇ"
+
+#. DESC_SAVE_PS_FLATEDECODED
+msgid ""
+"compress postscript image with zlib algorithm (flatedecode). When you want "
+"to print such a file your printer has to understand postscript level 3"
+msgstr ""
+"zlib ਐਲਗੋਰਥਿਮ (flatedecode) ਨਾਲ ਕੰਪਰੈੱਸ ਪੋਸਟਸਕ੍ਰਿਪਟ ਚਿੱਤਰ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਇਹ ਫਾਇਲ ਪਰਿੰਟ "
+"ਕਰਨੀ ਚਾਹੋ ਤਾਂ ਤੁਹਾਡੇ ਪਰਿੰਟਰ ਨੂੰ ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਲੈਵਲ 3 ਬਾਰੇ ਜਾਣਕਾਰੀ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
+
+#. DESC_SAVE_PDF_FLATEDECODED
+msgid "compress PDF image with zlib algorithm (flatedecode)."
+msgstr "zlib ਐਲਗੋਰਥਿਮ ਨਾਲ ਕੰਪਰੈਸ PDF ਚਿੱਤਰ (flatedecode)."
+
+#. DESC_SAVE_PNM16_AS_ASCII
+msgid ""
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
+"instead of binary format. The binary format is a new format that is not "
+"supported by all programs. The ASCII format is supported by more programs "
+"but it produces really huge files!!!"
+msgstr ""
+"ਜਦੋਂ ਇੱਕ 16 ਬਿੱਟ ਚਿੱਤਦ ਨੂੰ PNM ਫਾਰਮੈਟ 'ਚ ਸੰਭਾਲਿਆ ਜਾਵੇਗਾ ਤਾਂ ਬਾਈਨਰੀ ਫਾਰਮੈਟ ਦੀ ਬਜਾਏ ASCII "
+"ਫਾਰਮੈਟ ਵਰਤੋਂ। ਬਾਈਨਰੀ ਫਾਰਮੈਟ ਇੱਕ ਨਵਾਂ ਫਾਰਮੈਟ ਹੈ, ਜੋ ਕਿ ਸਭ ਪਰੋਗਰਾਮਾਂ ਵਲੋਂ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। "
+"ASCII ਫਾਰਮੈਟ ਕਈ ਪਰੋਗਰਾਮਾਂ ਵਲੋਂ ਸਹਾਇਕ ਹੈ, ਪਰ ਇਹ ਬਹੁਤ ਹੀ ਵੱਡੀਆਂ ਫਾਇਲਾਂ ਬਣਾਉਦਾ ਹੈ!!!"
+
+#. DESC_REDUCE_16BIT_TO_8BIT
+msgid ""
+"If scanner sends image with 16 bits/channel save image with 8 bits/channel"
+msgstr "ਜੇ ਸਕੈਨਰ 16 ਬਿੱਟ/ਚੈਨਲ ਸੰਭਾਲੋ ਚਿੱਤਰ ਨੂੰ 8 ਬਿੱਟ/ਚੈਨਲ ਨਾਲ ਭੇਜੇ"
+
+#. DESC_PSFILE_WIDTH
+msgid "Width of paper for postscript files"
+msgstr "ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਫਾਇਲਾਂ ਲਈ ਪੇਪਰ ਦੀ ਚੌੜਾਈ"
+
+#. DESC_PSFILE_HEIGHT
+msgid "Height of paper for postscript files"
+msgstr "ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਫਾਇਲਾਂ ਲਈ ਪੇਪਰ ਦੀ ਉਚਾਈ"
+
+#. DESC_PSFILE_LEFTOFFSET
+msgid ""
+"Left offset from the edge of the paper to the usable area for postscript "
+"files"
+msgstr "ਪੋਸਟਸਕ੍ਰਿਪਟ ਫਾਇਲਾਂ ਲਈ ਵਰਤੋਂ-ਯੋਗ ਏਰੀਆ ਵਾਸਤੇ ਪੇਪਰ ਦੇ ਕੋਨ ਤੋਂ ਖੱਬੇ ਆਫਸੈੱਟ"
+
+#. DESC_PSFILE_BOTTOMOFFSET
+msgid ""
+"Bottom offset from the edge of the paper to the usable area for postscript "
+"files"
+msgstr "ਪੋਸਟਸਕ੍ਰਿਪਟ ਫਾਇਲਾਂ ਲਈ ਵਰਤੋਂ-ਯੋਗ ਏਰੀਆ ਵਾਸਤੇ ਪੇਪਰ ਦੇ ਕੋਨ ਤੋਂ ਤਲ ਆਫਸੈੱਟ"
+
+#. DESC_MAIN_WINDOW_FIXED
+msgid "Use fixed main window size or scrolled, resizable main window"
+msgstr "ਫਿਕਸ ਮੇਨ ਵਿੰਡੋ ਸ਼ਾਇਜ਼ ਜਾਂ ਸਕਰੋਲ, ਮੁੜ-ਆਕਾਰਯੋਗ ਮੇਨ ਵਿੰਡੋ ਵਰਤੋਂ"
+
+#. DESC_DISABLE_GIMP_PREVIEW_GAMMA
+msgid "Disable preview gamma when XSane runs as GIMP plugin"
+msgstr "ਜਦੋਂ XSane ਜੈਮਪ ਪਲੱਗਇਨ ਵਾਂਗ ਚੱਲੇ ਤਾਂ ਝਲਕ ਗਾਮਾ ਆਯੋਗ ਕਰੋ"
+
+#. DESC_PREVIEW_COLORMAP
+msgid "Use an own colormap for preview if display depth is 8 bpp"
+msgstr "ਜੇ ਡਿਸਪਲੇਅ ਡੂੰਘਾਈ 8 bpp ਹੋਵੇ ਤਾਂ ਝਲਕ ਲਈ ਆਪਣਾ ਕਲਰ-ਮੈਪ ਵਰਤੋਂ"
+
+#. DESC_SHOW_RANGE_MODE
+msgid "Select how a range is displayed"
+msgstr "ਚੁਣੋ ਕਿ ਰੇਜ਼ ਕਿਵੇਂ ਵੇਖਾਈ ਜਾਵੇ"
+
+#. DESC_PREVIEW_OVERSAMPLING
+msgid "Value with which the calculated preview resolution is multiplied"
+msgstr "ਮੁੱਲ, ਜਿਸ ਨਾਲ ਕੈਲੂਕੇਟ ਕੀਤੇ ਝਲਕ ਰੈਜ਼ੋਲੂਸ਼ਨ ਨੂੰ ਗੁਣਾ ਕੀਤਾ ਜਾਵੇ"
+
+#. DESC_PREVIEW_GAMMA
+msgid "Set gamma correction value for preview image"
+msgstr "ਝਲਕ ਚਿੱਤਰ ਲਈ ਗਾਮਾ ਸੋਧ ਮੁੱਲ ਦਿਓ"
+
+#. DESC_PREVIEW_GAMMA_RED
+msgid "Set gamma correction value for red component of preview image"
+msgstr "ਝਲਕ ਚਿੱਤਰ ਵਿੱਚ ਲਾਲ ਰੰਗ ਲਈ ਗਾਮਾ ਸੋਧ ਮੁੱਲ ਦਿਓ"
+
+#. DESC_PREVIEW_GAMMA_GREEN
+msgid "Set gamma correction value for green component of preview image"
+msgstr "ਝਲਕ ਚਿੱਤਰ ਵਿੱਚ ਹਰੇ ਰੰਗ ਲਈ ਗਾਮਾ ਸੋਧ ਮੁੱਲ ਦਿਓ"
+
+#. DESC_PREVIEW_GAMMA_BLUE
+msgid "Set gamma correction value for blue component of preview image"
+msgstr "ਝਲਕ ਚਿੱਤਰ ਵਿੱਚ ਨੀਲੇ ਰੰਗ ਲਈ ਗਾਮਾ ਸੋਧ ਮੁੱਲ ਦਿਓ"
+
+#. DESC_LINEART_MODE
+msgid "Define the way XSane shall handle the threshold option"
+msgstr "ਥਰੈਸ਼ਹੋਲਡ ਚੋਣ ਹੈਂਡਲ ਕਰਨ ਲਈ XSane ਨੂੰ ਢੰਗ ਦਿਓ"
+
+#. DESC_GRAYSCALE_SCANMODE
+msgid ""
+"Select grayscale scanmode. This scanmode is used for lineart preview scan "
+"when transformation from grayscale to lineart is enabled"
+msgstr ""
+"ਗਰੇ-ਸਕੇਲ ਸਕੈਨਮੋਡ ਚੁਣੋ। ਇਹ ਸਕੈਨਮੋਡ ਨੂੰ ਲੀਨੀਅਰਟ ਝਲਕ ਸਕੈਨ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਗਰੇ-ਸਕੇਲ ਤੋਂ "
+"ਲੀਨੀਅਰਟ ਟਰਾਂਸਫਰਮੇਸ਼ਨ ਨੂੰ ਯੋਗ ਕੀਤਾ ਹੁੰਦਾ ਹੈ।"
+
+#. DESC_PREVIEW_THRESHOLD_MIN
+#, no-c-format
+msgid "The scanner's minimum threshold level in %"
+msgstr "ਸਕੈਨਰ ਦਾ ਘੱਟੋ-ਘੱਟ ਥਰੈਸ਼ਹੋਲਡ ਪੱਧਰ % ਵਿੱਚ"
+
+#. DESC_PREVIEW_THRESHOLD_MAX
+#, no-c-format
+msgid "The scanner's maximum threshold level in %"
+msgstr "ਸਕੈਨਰ ਦਾ ਵੱਧ ਤੋਂ ਵੱਧ ਥਰੈਸ਼ਹੋਲਡ ਪੱਧਰ % ਵਿੱਚ"
+
+#. DESC_PREVIEW_THRESHOLD_MUL
+msgid ""
+"Multiplier to make XSane threshold range and scanner threshold range the same"
+msgstr "XSane ਥਰੈਸ਼ਹੋਲਡ ਰੇਜ਼ ਅਤੇ ਸਕੈਨਰ ਥਰੈਸ਼ਹੋਲਡ ਰੇਜ਼ ਇੱਕ ਬਣਾਉਣ ਵਾਸਤੇ ਮਲਟੀਪਲਾਇਰ"
+
+#. DESC_PREVIEW_THRESHOLD_OFF
+msgid ""
+"Offset to make XSane threshold range and scanner threshold range the same"
+msgstr "XSane ਥਰੈਸ਼ਹੋਲਡ ਰੇਜ਼ ਅਤੇ ਸਕੈਨਰ ਥਰੈਸ਼ਹੋਲਡ ਰੇਜ਼ ਇੱਕ ਬਣਾਉਣ ਵਾਸਤੇ ਆਫਸੈੱਟ"
+
+#. DESC_ADF_PAGES_MAX
+msgid "Number of pages to scan"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ਿਆਂ ਦੀ ਗਿਣਤੀ"
+
+#. DESC_PREVIEW_PIPETTE_RANGE
+msgid "dimension of square that is used to average color for pipette function"
+msgstr "ਵਰਗ ਦਾ ਮਾਪ, ਜੋਂ ਕਿ ਪਿਪਟ (pipette) ਫੰਕਸ਼ਨ ਲਈ ਔਸਤ ਰੰਗ ਵਾਸਤੇ ਵਰਤਿਆ ਜਾਵੇ"
+
+#. DESC_DOC_VIEWER
+msgid ""
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
+msgstr "helpfiles ਵੇਖਾਉਣ ਲਈ ਕਮਾਂਡ ਦਿਓ, ਇੱਕ HTML-ਦਰਸ਼ਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ!"
+
+#. DESC_AUTOENHANCE_GAMMA
+msgid "Change gamma value when autoenhancement button is pressed"
+msgstr "ਆਟੋ-ਇੰਹਾਂਸਮੈਂਟ ਬਟਨ ਦਬਾਉਣ ਸਮੇਂ ਗਾਮਾ ਮੁੱਲ ਬਦਲੋ"
+
+#. DESC_PRESELECT_SCAN_AREA
+msgid "Select scan area after preview scan has finished"
+msgstr "ਸਕੈਨ ਝਲਕ ਪੂਰੀ ਹੋਣ ਦੇ ਬਾਅਦ ਸਕੈਨ-ਖੇਤਰ ਚੁਣੋ"
+
+#. DESC_AUTOCORRECT_COLORS
+msgid "Do color correction after preview scan has finished"
+msgstr "ਸਕੈਨ ਝਲਕ ਪੂਰੀ ਹੋਣ ਦੇ ਬਾਅਦ ਰੰਗ ਸੋਧ ਕਰੋ"
+
+#. DESC_RENDERING_INTENT
+msgid "Select rendering intent for preview and saving"
+msgstr "ਝਲਕ ਅਤੇ ਸੰਭਾਲਣ ਲਈ ਰੈਂਡਰਿੰਗ ਇੰਟੈੱਟ ਚੁਣੋ"
+
+#. DESC_CMS_BPC
+msgid "Apply black point compensation when color transformation is done"
+msgstr "ਜਦੋਂ ਕਲਰ ਟਰਾਂਸਫਰਮੇਸ਼ਨ ਪੂਰੀ ਹੋਵੇ ਤਾਂ ਕਾਲਾ ਪੁਆਇੰਟ ਕੰਪਨਸੇਸ਼ਨ ਲਾਗੂ ਕਰੋ"
+
+#. DESC_FAX_COMMAND
+msgid "Enter command to be executed in fax mode"
+msgstr "ਫੈਕਸ ਢੰਗ ਵਿੱਚ ਚਲਾਉਣ ਲਈ ਕਮਾਂਡ ਦਿਓ"
+
+#. DESC_FAX_RECEIVER_OPT
+msgid "Enter option to specify receiver"
+msgstr "ਰਿਸੀਵਰ ਦੇਣ ਲਈ ਚੋਣ ਦੱਸੋ"
+
+#. DESC_FAX_POSTSCRIPT_OPT
+msgid "Enter option to specify postscript files following"
+msgstr "ਅੱਗੇ ਪੋਸਟਸਕ੍ਰਿਪਟ ਫਾਇਲਾਂ ਦੇਣ ਵਾਸਤੇ ਚੋਣ ਦਿਓ"
+
+#. DESC_FAX_NORMAL_OPT
+msgid "Enter option to specify normal mode (low resolution)"
+msgstr "ਨਾਰਮਲ ਮੋਡ ਦੇਣ ਵਾਸਤੇ ਚੋਣ ਦਿਓ (ਘੱਟ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
+
+#. DESC_FAX_FINE_OPT
+msgid "Enter option to specify fine mode (high resolution)"
+msgstr "ਫਾਇਨ ਮੋਡ ਦੇਣ ਵਾਸਤੇ ਚੋਣ ਦਿਓ (ਉੱਚ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
+
+#. DESC_FAX_VIEWER
+msgid "Enter command to be executed to view a fax"
+msgstr "ਫੈਕਸ ਵੇਖਣ ਵਾਸਤੇ ਚਲਾਉਣ ਲਈ ਕਮਾਂਡ ਦਿਓ"
+
+#. DESC_FAX_FINE_MODE
+msgid "Send fax with high vertical resolution (196 lpi instead of 98 lpi)"
+msgstr "ਉੱਚ ਵਰਟੀਕਲ ਰੈਜ਼ੋਲੂਸ਼ਨ ਨਾਲ ਫੈਕਸ ਭੇਜੋ (98 lpi ਦੀ ਬਜਾਏ 196 lpi)"
+
+#. DESC_FAX_PS_FLATEDECODED
+msgid "Create zlib compressed postscript image for fax (flatedecode)"
+msgstr "ਫੈਕਸ ਲਈ zlib ਕੰਪਰੈੱਸ ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਚਿੱਤਰ ਬਣਾਓ (flatedecode)"
+
+#. DESC_SMTP_SERVER
+msgid "IP Address or Domain name of SMTP server"
+msgstr "SMTP ਸਰਵਰ ਦਾ IP ਐਡਰੈੱਸ ਜਾਂ ਡੋਮੇਨ ਨਾਂ"
+
+#. DESC_SMTP_PORT
+msgid "port to connect to SMTP server"
+msgstr "SMTP ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਪੋਰਟ"
+
+#. DESC_EMAIL_FROM
+msgid "enter your e-mail address"
+msgstr "ਆਪਣਾ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਦਿਓ"
+
+#. DESC_EMAIL_REPLY_TO
+msgid "enter e-mail address for replied e-mails"
+msgstr "ਜਵਾਬੀ ਈਮੇਲਾਂ ਲਈ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ"
+
+#. DESC_EMAIL_AUTHENTICATION
+msgid "Type of authentication before sending e-mail"
+msgstr "ਈਮੇਲ ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਪਰਮਾਣਕਿਤਾ ਦੀ ਟਾਈਪ"
+
+#. DESC_EMAIL_AUTH_USER
+msgid "user name for e-mail server"
+msgstr "ਈ-ਮੇਲ ਸਰਵਰ ਲਈ ਯੂਜ਼ਰ ਨਾਂ ਦਿਓ"
+
+#. DESC_EMAIL_AUTH_PASS
+msgid "password for e-mail server"
+msgstr "ਈ-ਮੇਲ ਸਰਵਰ ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
+
+#. DESC_POP3_SERVER
+msgid "IP Address or Domain name of POP3 server"
+msgstr "POP3 ਸਰਵਰ ਦਾ IP ਐਡਰੈੱਸ ਜਾਂ ਡੋਮੇਨ ਨਾਂ"
+
+#. DESC_POP3_PORT
+msgid "port to connect to POP3 server"
+msgstr "POP3 ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਪੋਰਟ"
+
+#. DESC_HTML_EMAIL
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
+msgstr "HTML ਮੋਡ ਵਿੱਚ ਈਮੇਲ ਭੇਜੀ, ਚਿੱਤਰ ਹੈ: <IMAGE>"
+
+#. DESC_OCR_COMMAND
+msgid "Enter command to start OCR program"
+msgstr "OCR ਪਰੋਗਰਾਮ ਚਲਾਉਣ ਲਈ ਕਮਾਂਡ ਦਿਓ"
+
+#. DESC_OCR_INPUTFILE_OPT
+msgid "Enter option of the OCR program to define input file"
+msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਦੇਣ ਵਾਸਤੇ OCR ਪਰੋਗਰਾਮ ਦੀ ਚੋਣ ਦਿਓ"
+
+#. DESC_OCR_OUTPUTFILE_OPT
+msgid "Enter option of the OCR program to define output file"
+msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ ਦੇਣ ਵਾਸਤੇ OCR ਪਰੋਗਰਾਮ ਦੀ ਚੋਣ ਦਿਓ"
+
+#. DESC_OCR_USE_GUI_PIPE_OPT
+msgid "Define if the OCR program supports gui progress pipe"
+msgstr "ਜੇ OCR ਪਰੋਗਰਾਮ gui ਪਰੋਗਰੈੱਸ ਪਾਈਪ ਲਈ ਸਹਿਯੋਗ ਹੈ ਤਾਂ ਦਿਓ"
+
+#. DESC_OCR_OUTFD_OPT
+msgid ""
+"Enter option of the OCR program to define output filedescripor in GUI mode"
+msgstr "GUI ਮੋਡ ਵਿੱਚ ਆਉਟ-ਪੁੱਟ filedescripor ਦੇਣ ਵਾਸਤੇ OCR ਪਰੋਗਰਾਮ ਦੀ ਚੋਣ ਦਿਓ"
+
+#. DESC_OCR_PROGRESS_KEYWORD
+msgid "Define Keyword that is used to mark progress information"
+msgstr "ਸ਼ਬਦ ਦਿਓ, ਜੋ ਕਿ ਪਰੋਗਰੈੱਸ ਜਾਣਕਾਰੀ ਲਈ ਨਿਸ਼ਾਨ ਵਜੋਂ ਵਰਤਿਆ ਜਾਵੇ"
+
+#. DESC_PERMISSION_READ
+msgid "read"
+msgstr "ਪੜ੍ਹਨ"
+
+#. DESC_PERMISSION_WRITE
+msgid "write"
+msgstr "ਲਿਖਣ"
+
+#. DESC_PERMISSION_SEARCH
+msgid "search"
+msgstr "ਖੋਜ"
+
+#. DESC_ADD_BATCH
+msgid "Add selection for batch scan"
+msgstr "ਬੈਂਚ ਸਕੈਨ ਲਈ ਚੋਣ ਸ਼ਾਮਲ ਕਰੋ"
+
+#. DESC_PIPETTE_WHITE
+msgid "Pick white point"
+msgstr "ਚਿੱਟਾ ਪੁਆਇੰਟ ਲਵੋ"
+
+#. DESC_PIPETTE_GRAY
+msgid "Pick gray point"
+msgstr "ਸਲੇਟੀ ਪੁਆਇੰਟ ਲਵੋ"
+
+#. DESC_PIPETTE_BLACK
+msgid "Pick black point"
+msgstr "ਕਾਲਾ ਪੁਆਇੰਟ ਲਵੋ"
+
+#. DESC_ZOOM_FULL
+msgid "Use full scan area"
+msgstr "ਪੂਰਾ ਸਕੈਨ ਖੇਤਰ ਵਰਤੋਂ"
+
+#. DESC_ZOOM_OUT
+#, no-c-format
+msgid "Zoom 20% out"
+msgstr "ਜ਼ੂਮ 20% ਆਉਟ"
+
+#. DESC_ZOOM_IN
+msgid "Click at position to zoom to"
+msgstr "ਜ਼ੂਮ ਕਰਨ ਲਈ ਸਥਿਤੀ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ"
+
+#. DESC_ZOOM_AREA
+msgid "Zoom into selected area"
+msgstr "ਚੁਣੇ ਖੇਤਰ ਲਈ ਜ਼ੂਮ"
+
+#. DESC_ZOOM_UNDO
+msgid "Undo last zoom"
+msgstr "ਆਖਰੀ ਜ਼ੂਮ ਵਾਪਸ"
+
+#. DESC_FULL_PREVIEW_AREA
+msgid "Select visible area"
+msgstr "ਦੇਖਣਯੋਗ ਖੇਤਰ ਚੁਣੋ"
+
+#. DESC_AUTOSELECT_SCAN_AREA
+msgid "Autoselect scan area"
+msgstr "ਸਕੈਨ-ਖੇਤਰ ਆਟੋ-ਚੁਣੋ"
+
+#. DESC_AUTORAISE_SCAN_AREA
+msgid "Autoraise scan area"
+msgstr "ਸਕੈਨ-ਖੇਤਰ ਆਟੋ-ਉਭਾਰੋ"
+
+#. DESC_DELETE_IMAGES
+msgid "Delete preview image cache"
+msgstr "ਝਲਕ ਚਿੱਤਰ ਕੈਚੇ ਹਟਾਓ"
+
+#. DESC_PRESET_AREA
+msgid ""
+"Preset area:\n"
+"To add new area or edit an existing area use context menu (alternate mouse "
+"button)."
+msgstr ""
+"ਪ੍ਰੀ-ਸੈੱਟ ਏਰੀਆ:\n"
+"ਇੱਕ ਨਵਾਂ ਖੇਤਰ ਸ਼ਾਮਲ ਕਰਨ ਜਾਂ ਇੱਕ ਮੌਜੂਦ ਖੇਤਰ ਸੋਧਣ ਵਾਸਤੇ ਪਰਸੰਗ ਮੇਨੂ (ਮਾਊਂਸ ਬਟਨ ਦਾ ਬਦਲ) ਵਰਤੋਂ।"
+
+#. DESC_ROTATION
+msgid "Rotate preview and scan"
+msgstr "ਝਲਕ ਅਤੇ ਸਕੈਨ ਘੁੰਮਾਓ"
+
+#. DESC_RATIO
+msgid "Aspect ratio of selection"
+msgstr "ਚੋਣ ਲਈ ਆਕਾਰ ਅਨੁਪਾਤ"
+
+#. DESC_PAPER_ORIENTATION
+msgid "Define image position for printing"
+msgstr "ਪਰਿੰਟ ਕਰਨ ਲਈ ਚਿੱਤਰ ਸਥਿਤੀ ਦਿਓ"
+
+#. DESC_VIEWER_OCR
+msgid "Optical Character Recognition"
+msgstr "ਆਪਟੀਕਲ ਕਰੈਕਟਰ ਰੀਕੋਨਾਈਜ਼ੇਸ਼ਨ (OCR)"
+
+#. DESC_VIEWER_UNDO
+msgid "Undo last change"
+msgstr "ਆਖਰੀ ਬਦਲਾਅ ਵਾਪਿਸ ਲਵੋ"
+
+#. DESC_VIEWER_CLONE
+msgid "Clone image"
+msgstr "ਚਿੱਤਰ ਕਲੋਨ ਕਰੋ"
+
+#. DESC_ROTATE90
+msgid "Rotate image 90 degrees"
+msgstr "ਚਿੱਤਰ 90 ਡਿਗਰੀ ਘੁੰਮਾਓ"
+
+#. DESC_ROTATE180
+msgid "Rotate image 180 degrees"
+msgstr "ਚਿੱਤਰ 180 ਡਿਗਰੀ ਘੁੰਮਾਓ"
+
+#. DESC_ROTATE270
+msgid "Rotate image 270 degrees"
+msgstr "ਚਿੱਤਰ 270 ਡਿਗਰੀ ਘੁੰਮਾਓ"
+
+#. DESC_MIRROR_X
+msgid "Mirror image at vertical axis"
+msgstr "ਵਰਟੀਕਲ ਧੁਰੇ ਉੱਤੇ ਚਿੱਤਰ ਮਿੱਰਰ ਕਰੋ"
+
+#. DESC_MIRROR_Y
+msgid "Mirror image at horizontal axis"
+msgstr "ਹਾਰੀਜ਼ਟਲ ਧੁਰੇ ਉੱਤੇ ਚਿੱਤਰ ਮਿੱਰਰ ਕਰੋ"
+
+#. DESC_VIEWER_ZOOM
+msgid "Zoom image"
+msgstr "ਚਿੱਤਰ ਜ਼ੂਮ"
+
+#. DESC_STORE_MEDIUM
+msgid "Store medium"
+msgstr "ਮੀਡਿਅਮ ਸਟੋਰ ਕਰੋ"
+
+#. DESC_DELETE_MEDIUM
+msgid "Delete active medium"
+msgstr "ਐਕਟਿਵ ਮੀਡਿਅਮ ਹਟਾਓ"
+
+#. DESC_SCALE_FACTOR
+msgid "Scale factor"
+msgstr "ਸਕੇਲ ਫੈਕਟਰ"
+
+#. DESC_X_SCALE_FACTOR
+msgid "X-Scale factor"
+msgstr "X-ਸਕੇਲ ਫੈਕਟਰ"
+
+#. DESC_Y_SCALE_FACTOR
+msgid "Y-Scale factor"
+msgstr "Y-ਸਕੇਲ ਫੈਕਟਰ"
+
+#. DESC_SCALE_WIDTH
+msgid "Scale image to width [pixels]"
+msgstr "ਚਿੱਤਰ ਨੂੰ ਚੌੜਾਈ [pixels] ਲਈ ਸਕੇਲ ਕਰੋ"
+
+#. DESC_SCALE_HEIGHT
+msgid "Scale image to height [pixels]"
+msgstr "ਚਿੱਤਰ ਨੂੰ ਉਚਾਈ [pixels] ਲਈ ਸਕੇਲ ਕਰੋ"
+
+#. DESC_BATCH_LIST_EMPTY
+msgid "Empty batch list"
+msgstr "ਬੈਂਚ ਲਿਸਟ ਖਾਲੀ ਕਰੋ"
+
+#. DESC_BATCH_LIST_SAVE
+msgid "Save batch list"
+msgstr "ਬੈਂਚ ਲਿਸਟ ਸੰਭਾਲੋ"
+
+#. DESC_BATCH_LIST_LOAD
+msgid "Load batch list"
+msgstr "ਬੈਂਚ ਲਿਸਟ ਲੋਡ ਕਰੋ"
+
+#. DESC_BATCH_RENAME
+msgid "Rename area"
+msgstr "ਖੇਤਰ ਨਾਂ ਬਦਲੋ"
+
+#. DESC_BATCH_ADD
+msgid "Add selected preview area to batch list"
+msgstr "ਬੈਂਚ ਲਿਸਟ ਲਈ ਚੁਣਿਆ ਝਲਕ ਖੇਤਰ ਸ਼ਾਮਲ ਕਰੋ"
+
+#. DESC_BATCH_DEL
+msgid "Delete selected area from batch list"
+msgstr "ਬੈਂਚ ਲਿਸਟ ਤੋਂ ਚੁਣਿਆ ਖੇਤਰ ਹਟਾਓ"
+
+#. DESC_AUTOMATIC
+msgid "Turns on automatic mode"
+msgstr "ਆਟੋਮੈਟਿਕ ਮੋਡ ਚਾਲੂ ਕਰੋ"
+
+#. DESC_BUTTON_SCANNER_DEFAULT_COLOR_ICM_PROFILE_BROWSE
+msgid "Browse for scanner default color ICM-profile"
+msgstr "ਸਕੈਨਰ ਡਿਫਾਲਟ ਕਲਰ ICM-ਪਰੋਫਾਇਲ ਲਈ ਝਲਕ"
+
+#. DESC_BUTTON_SCANNER_DEFAULT_GRAY_ICM_PROFILE_BROWSE
+msgid "Browse for scanner default gray ICM-profile"
+msgstr "ਸਕੈਨਰ ਡਿਫਾਲਟ ਗਰੇ ICM-ਪਰੋਫਾਇਲ ਲਈ ਝਲਕ"
+
+#. DESC_BUTTON_DISPLAY_ICM_PROFILE_BROWSE
+msgid "Browse for display ICM-profile"
+msgstr "ਡਿਸਪਲੇਅ ICM-ਪਰੋਫਾਇਲ ਲਈ ਝਲਕ"
+
+#. DESC_BUTTON_PRINTER_ICM_PROFILE_BROWSE
+msgid "Browse for printer ICM-profile"
+msgstr "ਪਰਿੰਟਰ ICM-ਪਰੋਫਾਇਲ ਲਈ ਝਲਕ"
+
+#. DESC_BUTTON_CUSTOM_PROOFING_ICM_PROFILE_BROWSE
+msgid "Browse for custom proofing ICM-profile"
+msgstr "ਕਸਟਮ ਪਰੂਫ਼ਿੰਗ ICM-ਪਰੋਫਾਇਲ ਲਈ ਝਲਕ"
+
+#. DESC_BUTTON_WORKING_COLOR_SPACE_ICM_PROFILE_BROWSE
+msgid "Browse for working color space ICM-profile"
+msgstr "ਵਰਕਿੰਗ ਕਲਰ ਸਪੇਸ ICM-ਪਰੋਫਾਇਲ ਲਈ ਝਲਕ"
+
+#. ERR_HOME_DIR
+msgid "Failed to determine home directory:"
+msgstr "ਘਰ ਡਾਇਰੈਕਟਰੀ ਪਛਾਣਨ ਲਈ ਫੇਲ੍ਹ:"
+
+#. ERR_CHANGE_WORKING_DIR
+msgid "Failed to change working directory to"
+msgstr "ਵਰਕਿੰਗ ਡਾਇਰੈਕਟਰੀ ਬਦਲਣ ਲਈ ਫੇਲ੍ਹ"
+
+#. ERR_FILENAME_TOO_LONG
+msgid "Filename too long"
+msgstr "ਫਾਇਲ ਨਾਂ ਬਹੁਤ ਲੰਮਾ ਹੈ"
+
+#. ERR_CREATE_TEMP_FILE
+msgid ""
+"Could not create temporary file.\n"
+"Open Menue Preferences->Setup Tab Save and\n"
+"select a temporary directory where you have\n"
+"write permissions."
+msgstr ""
+"ਆਰਜ਼ੀ ਫਾਇਲ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕੀ।\n"
+"ਪਸੰਦ ->ਸੈੱਟਅੱਪ ਮੇਨੂ ਤੋਂ ਸੰਭਾਲੋ ਟੈਬ ਖੋਲ੍ਹੋ ਅਤੇ\n"
+"ਇੱਕ ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਚੁਣੋ, ਜਿੱਥੇ ਕਿ ਤੁਹਾਨੂੰ ਲਿਖਣ\n"
+"ਅਧਿਕਾਰ ਹੋਣ।"
+
+#. ERR_SET_OPTION
+msgid "Failed to set value of option"
+msgstr "ਚੋਣ ਲਈ ਮੁੱਲ ਸੈੱਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#. ERR_GET_OPTION
+msgid "Failed to obtain value of option"
+msgstr "ਚੋਣ ਲਈ ਮੁੱਲ ਲੈਣ ਲਈ ਫੇਲ੍ਹ"
+
+#. ERR_OPTION_COUNT
+msgid "Error obtaining option count"
+msgstr "ਚੋਣ ਗਿਣਤੀ ਲੈਣ ਲਈ ਗਲਤੀ"
+
+#. ERR_DEVICE_OPEN_FAILED
+msgid "Failed to open device"
+msgstr "ਜੰਤਰ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੋਇਆ"
+
+#. ERR_NO_DEVICES
+msgid "no devices available"
+msgstr "ਕੋਈ ਜੰਤਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
+
+#. ERR_DURING_READ
+msgid "Error during read:"
+msgstr "ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ:"
+
+#. ERR_DURING_SAVE
+msgid "Error during save:"
+msgstr "ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ:"
+
+#. ERR_BAD_DEPTH
+msgid "Can't handle depth"
+msgstr "ਡੂੰਘਾਈ ਹੈਂਡਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"
+
+#. ERR_UNKNOWN_SAVING_FORMAT
+msgid "Unknown file format for saving"
+msgstr "ਸੰਭਾਲਣ ਲਈ ਅਣਜਾਣ ਫਾਇਲ ਫਾਰਮੈਟ"
+
+#. ERR_OPEN_FAILED
+msgid "Failed to open"
+msgstr "ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੋਇਆ"
+
+#. ERR_CREATE_SECURE_FILE
+msgid "Could not create secure file (maybe a link does exist):"
+msgstr "ਸੁਰੱਖਿਅਤ ਫਾਇਲ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕੀ (ਸ਼ਾਇਦ ਇੱਕ ਲਿੰਕ ਮੌਜੂਦ ਹੋ ਸਕਦਾ ਹੈ):"
+
+#. ERR_FAILED_PRINTER_PIPE
+msgid "Failed to open pipe for executing printercommand"
+msgstr "ਪਰਿੰਟਰ-ਕਮਾਂਡ ਚਲਾਉਣ ਵਾਸਤੇ ਪਾਇਪ ਖੋਲ੍ਹਣ ਵਾਸਤੇ ਫੇਲ੍ਹ ਹੈ"
+
+#. ERR_FAILED_EXEC_PRINTER_CMD
+msgid "Failed to execute printercommand:"
+msgstr "ਪਰਿੰਟਰ ਕਮਾਂਡ ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ:"
+
+#. ERR_FAILED_START_SCANNER
+msgid "Failed to start scanner:"
+msgstr "ਸਕੈਨਰ ਚਾਲੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ:"
+
+#. ERR_FAILED_GET_PARAMS
+msgid "Failed to get parameters:"
+msgstr "ਮੁੱਲ ਲੈਣ ਲਈ ਫੇਲ੍ਹ:"
+
+#. ERR_NO_OUTPUT_FORMAT
+msgid "No output format given"
+msgstr "ਕੋਈ ਆਉਟਪੁੱਟ ਫਾਰਮੈਟ ਨਹੀਂ ਦਿੱਤਾ ਹੈ"
+
+#. ERR_NO_MEM
+msgid "out of memory"
+msgstr "ਮੈਮੋਰੀ ਖਤਮ ਹੋ ਗਈ"
+
+#. ERR_TOO_MUCH_DATA
+msgid "Backend sends more image data than it defined in parameters"
+msgstr "ਬੈਕਐਂਡ ਆਪਣੇ ਦਿੱਤੇ ਪੈਰਾਮੀਟਰ ਤੋਂ ਵੱਧ ਚਿੱਤਰ ਡਾਟਾ ਭੇਜਦਾ ਹੈ"
+
+#. ERR_LIBTIFF
+msgid "LIBTIFF reports error"
+msgstr "LIBTIFF ਨੇ ਗਲਤੀ ਦਿੱਤੀ ਹੈ"
+
+#. ERR_LIBPNG
+msgid "LIBPNG reports error"
+msgstr "LIBPNG ਨੇ ਗਲਤੀ ਦਿੱਤੀ ਹੈ"
+
+#. ERR_LIBJPEG
+msgid "LIBJPEG reports error"
+msgstr "LIBJPEG ਨੇ ਗਲਤੀ ਦਿੱਤੀ ਹੈ"
+
+#. ERR_ZLIB
+msgid "ZLIB error or memory allocation problem"
+msgstr "ZLIB ਗਲਤੀ ਜਾਂ ਮੈਮੋਰੀ ਜਾਰੀ ਕਰਨ ਸਮੱਸਿਆ ਹੈ"
+
+#. ERR_UNKNOWN_TYPE
+msgid "unknown type"
+msgstr "ਅਣਜਾਣ ਟਾਈਪ"
+
+#. ERR_UNKNOWN_CONSTRAINT_TYPE
+msgid "unknown constraint type"
+msgstr "ਅਣਜਾਣ ਕਨਸਟਰੇਂਟ ਟਾਈਪ"
+
+#. ERR_OPTION_NAME_NULL
+msgid "Option has empty name (NULL)."
+msgstr "ਚੋਣ ਲਈ ਖਾਲੀ ਨਾਂ (NULL) ਹੈ।"
+
+#. ERR_BACKEND_BUG
+msgid "This is a backend bug. Please inform the author of the backend!"
+msgstr "ਇਹ ਬੈਕਐਂਡ ਬੱਗ ਹੈ। ਬੈਕਐਂਡ ਦੇ ਲੇਖਕ ਨੂੰ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ!"
+
+#. ERR_FAILED_EXEC_DOC_VIEWER
+msgid "Failed to execute documentation viewer:"
+msgstr "ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ:"
+
+#. ERR_FAILED_EXEC_FAX_VIEWER
+msgid "Failed to execute fax viewer:"
+msgstr "ਫੈਕਸ ਦਰਸ਼ਕ ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ:"
+
+#. ERR_FAILED_EXEC_FAX_CMD
+msgid "Failed to execute fax command:"
+msgstr "ਫੈਕਸ ਕਮਾਂਡ ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ:"
+
+#. ERR_FAILED_EXEC_OCR_CMD
+msgid "Failed to execute OCR command:"
+msgstr "OCR ਕਮਾਂਡ ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ:"
+
+#. ERR_BAD_FRAME_FORMAT
+msgid "bad frame format"
+msgstr "ਗਲਤ ਫਰੇਮ ਫਾਰਮੈਟ"
+
+#. ERR_FAILED_SET_RESOLUTION
+msgid "unable to set resolution"
+msgstr "ਰੈਜ਼ੋਲੇਸ਼ਨ ਸੈੱਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+#. ERR_PASSWORD_FILE_INSECURE
+#, c-format
+msgid "Password file (%s) is insecure, use permission x00\n"
+msgstr "ਪਾਸਵਰਡ ਫਾਇਲ (%s) ਅਸੁਰੱਖਿਅਤ ਹੈ, ਅਧਿਕਾਰ x00 ਵਰਤੋਂ\n"
+
+#. ERR_ERROR
+msgid "error"
+msgstr "ਗਲਤੀ"
+
+#. ERR_MAJOR_VERSION_NR_CONFLICT
+msgid "Sane major version number mismatch!"
+msgstr "ਸੇਨ (sane) ਮੇਜਰ ਵਰਜਨ ਨੰਬਰ ਮਿਲਦਾ ਨਹੀਂ!"
+
+#. ERR_XSANE_MAJOR_VERSION
+msgid "XSane major version ="
+msgstr "XSane ਮੁੱਖ ਵਰਜਨ ="
+
+#. ERR_BACKEND_MAJOR_VERSION
+msgid "backend major version ="
+msgstr "ਬੈਕਐਂਡ ਮੁੱਖ ਵਰਜਨ ="
+
+#. ERR_PROGRAM_ABORTED
+msgid "*** PROGRAM ABORTED ***"
+msgstr "*** ਪਰੋਗਰਾਮ ਅਧੂਰਾ ਛੱਡਿਆ ***"
+
+#. ERR_FAILED_ALLOCATE_IMAGE
+msgid "Failed to allocate image memory:"
+msgstr "ਚਿੱਤਰ ਮੈਮੋਰੀ ਦੇਣ ਲਈ ਫੇਲ੍ਹ:"
+
+#. ERR_PREVIEW_BAD_DEPTH
+msgid "Preview cannot handle bit depth"
+msgstr "ਝਲਕ ਬਿੱਟ ਡੂੰਘਾਈ ਹੈਂਡਲ ਨਹੀਂ ਕਰ ਸਕਦੀ ਹੈ"
+
+#. ERR_GIMP_SUPPORT_MISSING
+msgid "GIMP support missing"
+msgstr "ਜੈਮਪ ਸਹਿਯੋਗ ਗੁੰਮ ਹੈ"
+
+#. ERR_CREATE_FAX_PROJECT
+msgid "Could not create faxproject"
+msgstr "ਫੈਕਸ-ਪਰੋਜੈਕਟ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ"
+
+#. WARN_COUNTER_UNDERRUN
+msgid "Filename counter underrun"
+msgstr "ਫਾਇਲ-ਨਾਂ ਕਾਊਂਟਰ ਅੰਡਰ-ਰਨ (underrun)"
+
+#. WARN_NO_VALUE_CONSTRAINT
+msgid "warning: option has no value constraint"
+msgstr "ਚੇਤਾਵਨੀ: ਚੋਣ ਲਈ ਕੋਈ ਮੁੱਲ ਪਾਬੰਦੀ ਨਹੀਂ ਹੈ।"
+
+#. WARN_XSANE_AS_ROOT
+msgid ""
+"You try to run XSane as ROOT, that really is DANGEROUS!\n"
+"\n"
+"Do not send any bug reports when you\n"
+"have any problems while running XSane as root:\n"
+"YOU ARE ALONE!"
+msgstr ""
+"ਤੁਸੀਂ XSane ਨੂੰ ROOT ਵਾਂਗ ਚਲਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ *ਖਤਰਨਾਕ* ਹੈ!\n"
+"\n"
+"ਜਦੋਂ ਤੁਸੀਂ XSane ਨੂੰ root ਵਾਂਗ ਚਲਾਉਦੇ ਹੋਵੋ ਤਾਂ\n"
+"ਕੋਈ ਵੀ ਬੱਗ ਜਾਣਕਾਰੀ ਨਾ ਭੇਜੋ ਜੀ:\n"
+"*ਤੁਸੀਂ ਇੱਕਲੇ ਹੀ ਕਰੋ*!"
+
+#. ERR_HEADER_ERROR
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#. ERR_HEADER_WARNING
+msgid "Warning"
+msgstr "ਚੇਤਾਵਨੀ"
+
+#. ERR_HEADER_INFO
+msgid "Information"
+msgstr "ਜਾਣਕਾਰੀ"
+
+#. ERR_HEADER_CHILD_PROCESS_ERROR
+msgid "Child process error"
+msgstr "ਚਾਇਲਡ ਕਾਰਵਾਈ ਗਲਤੀ"
+
+#. ERR_FAILED_CREATE_FILE
+msgid "Failed to create file:"
+msgstr "ਫਾਇਲ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ:"
+
+#. ERR_LOAD_DEVICE_SETTINGS
+msgid "Error while loading device settings:"
+msgstr "ਜੰਤਰ ਸੈਟਿੰਗ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:"
+
+#. ERR_NO_DRC_FILE
+msgid "is not a device-rc-file !!!"
+msgstr "ਇੱਕ device-rc-file ਨਹੀਂ ਹੈ!!!"
+
+#. ERR_NETSCAPE_EXECUTE_FAIL
+msgid "Failed to execute netscape!"
+msgstr "ਨੈੱਟਸਕੇਪ ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ!"
+
+#. ERR_SENDFAX_RECEIVER_MISSING
+msgid "Send fax: no receiver defined"
+msgstr "ਫੈਕਸ ਭੇਜੋ: ਕੋਈ ਰਿਸੀਵਰ ਨਹੀਂ ਦਿੱਤਾ"
+
+#. ERR_CREATED_FOR_DEVICE
+msgid "has been created for device"
+msgstr "ਜੰਤਰ ਲਈ ਬਣਾਇਆ ਗਿਆ"
+
+#. ERR_USED_FOR_DEVICE
+msgid "you want to use it for device"
+msgstr "ਤੁਸੀਂ ਇਸ ਨੂੰ ਜੰਤਰ ਲਈ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ"
+
+#. ERR_MAY_CAUSE_PROBLEMS
+msgid "this may cause problems!"
+msgstr "ਇਹ ਸਮੱਸਿਆ ਪੈਦਾ ਕਰ ਸਕਦਾ ਹੈ!"
+
+#. WARN_UNSAVED_IMAGES
+#, c-format
+msgid "There are %d unsaved images"
+msgstr "%d ਨਾ-ਸੰਭਾਲੇ ਚਿੱਤਰ ਹਨ"
+
+#. WARN_FILE_EXISTS
+#, c-format
+msgid "File %s already exists"
+msgstr "ਫਾਇਲ %s ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
+
+#. ERR_FILE_NOT_EXISTS
+#, c-format
+msgid "File %s does not exist"
+msgstr "ਫਾਇਲ %s ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+
+#. ERR_FILE_NOT_POSTSCRIPT
+#, c-format
+msgid "File %s is not a postscript file"
+msgstr "ਫਾਇਲ %s ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਨਹੀਂ ਹੈ"
+
+#. ERR_UNSUPPORTED_OUTPUT_FORMAT
+#, c-format
+msgid "Unsupported %d-bit output format: %s"
+msgstr "ਨਾ-ਸਹਾਇਕ %d-ਬਿੱਟ ਆਉਟਪੁੱਟ ਫਾਰਮੈਟ: %s"
+
+#. ERR_CMS_CONVERSION
+msgid "Error during CMS conversion:"
+msgstr "CMS ਕਨਵਰਜਨ ਦੇ ਦੌਰਾਨ ਗਲਤੀ:"
+
+#. ERR_CMS_OPEN_ICM_FILE
+msgid "Could not open"
+msgstr "ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#. CMS_SCANNER_ICM
+msgid "scanner ICM profile"
+msgstr "ਸਕੈਨਰ ICM ਪਰੋਫਾਇਲ"
+
+#. CMS_DISPLAY_ICM
+msgid "display ICM profile"
+msgstr "ਡਿਸਪਲੇਅ ICM ਪਰੋਫਾਇਲ"
+
+#. CMS_PROOF_ICM
+msgid "proofing ICM profile"
+msgstr "ਪਰੂਫਿੰਗ ICM ਪਰੋਫਾਇਲ"
+
+#. ERR_CMS_CREATE_TRANSFORM
+msgid "Could not create transform"
+msgstr "ਟਰਾਂਸਫਰਮ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+#. WARN_VIEWER_IMAGE_NOT_SAVED
+msgid "viewer image is not saved"
+msgstr "ਵੇਖਾਇਆ ਚਿੱਤਰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+
+#. FILE_FILTER_ALL_FILES
+msgid "All files"
+msgstr "ਸਭ ਫਾਇਲਾਂ"
+
+#. FILE_FILTER_IMAGES
+msgid "Images"
+msgstr "ਚਿੱਤਰ"
+
+#. FILE_FILTER_XBL
+msgid "XSane batch list"
+msgstr "XSane ਬੈਂਚ ਲਿਸਟ"
+
+#. FILE_FILTER_ICM
+msgid "ICC/ICM Profiles"
+msgstr "ICC/ICM ਪਰੋਫਾਇਲ"
+
+#. FILE_FILTER_DRC
+msgid "XSane device preferences"
+msgstr "XSane ਜੰਤਰ ਪਸੰਦ"
+
+#. FILE_FILTER_RC
+msgid "XSane preferences"
+msgstr "XSane ਪਸੰਦ"
+
+#. TEXT_USAGE
+msgid "Usage:"
+msgstr "ਵਰਤੋਂ:"
+
+#. TEXT_USAGE_OPTIONS
+msgid "[OPTION]... [DEVICE]"
+msgstr "[OPTION]... [DEVICE]"
+
+#. TEXT_HELP
+msgid ""
+"Start up graphical user interface to access SANE (Scanner Access Now Easy) "
+"devices.\n"
+"\n"
+"The format of [DEVICE] is backendname:devicefile (e.g. umax:/dev/scanner).\n"
+"[OPTION]... can be a combination of the following items:\n"
+" -h, --help                   display this help message and exit\n"
+" -v, --version                print version information\n"
+" -l, --license                print license information\n"
+"\n"
+" -d, --device-settings file   load device settings from file (without \".drc"
+"\")\n"
+"\n"
+" -V, --viewer                 start with viewer-mode active (default)\n"
+" -s, --save                   start with save-mode active\n"
+" -c, --copy                   start with copy-mode active\n"
+" -m, --multipage              start with multipage-mode active\n"
+" -f, --fax                    start with fax-mode active\n"
+" -e, --email                  start with e-mail-mode active\n"
+" -n, --no-mode-selection      disable menu for XSane mode selection\n"
+"\n"
+" -F, --Fixed                  fixed main window size (overwrite preferences "
+"value)\n"
+" -R, --Resizeable             resizable, scrolled main window (overwrite "
+"preferences value)\n"
+"\n"
+" -p, --print-filenames        print image filenames created by XSane\n"
+" -N, --force-filename name    force filename and disable user filename "
+"selection\n"
+"\n"
+" --display X11-display        redirect output to X11-display\n"
+" --no-xshm                    do not use shared memory images\n"
+" --sync                       request a synchronous connection with the X11 "
+"server"
+msgstr ""
+"SANE (Scanner Access Now Easy) ਜੰਤਰਾਂ ਲਈ ਗਰਾਫਿਕਲ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਸ਼ੁਰੂ ਕਰੋ\n"
+"\n"
+"[DEVICE] ਦਾ ਫਾਰਮੈਟ backendname:devicefile (ਜਿਵੇਂ umax:/dev/scanner) ਹੈ।\n"
+"[OPTION]... ਹੇਠ ਦਿੱਤੀਆਂ ਆਈਟਮਾਂ ਦਾ ਜੋੜ ਹੋ ਸਕਦਾ ਹੈ:\n"
+" -h, --help                   display this help message and exit\n"
+" -v, --version                print version information\n"
+" -l, --license                print license information\n"
+"\n"
+" -d, --device-settings file   load device settings from file (without \".drc"
+"\")\n"
+"\n"
+" -V, --viewer                 start with viewer-mode active (default)\n"
+" -s, --save                   start with save-mode active\n"
+" -c, --copy                   start with copy-mode active\n"
+" -m, --multipage              start with multipage-mode active\n"
+" -f, --fax                    start with fax-mode active\n"
+" -e, --email                  start with e-mail-mode active\n"
+" -n, --no-mode-selection      disable menu for XSane mode selection\n"
+"\n"
+" -F, --Fixed                  fixed main window size (overwrite preferences "
+"value)\n"
+" -R, --Resizeable             resizable, scrolled main window (overwrite "
+"preferences value)\n"
+"\n"
+" -p, --print-filenames        print image filenames created by XSane\n"
+" -N, --force-filename name    force filename and disable user filename "
+"selection\n"
+"\n"
+" --display X11-display        redirect output to X11-display\n"
+" --no-xshm                    do not use shared memory images\n"
+" --sync                       request a synchronous connection with the X11 "
+"server"
+
+#. strings for gimp plugin
+#. XSANE_GIMP_INSTALL_BLURB
+msgid "Front-end to the SANE interface"
+msgstr "SANE ਇੰਟਰਫੇਸ ਲਈ ਫਰੰਟ-ਐਂਡ"
+
+#. XSANE_GIMP_INSTALL_HELP
+msgid ""
+"This function provides access to scanners and other image acquisition "
+"devices through the SANE (Scanner Access Now Easy) interface."
+msgstr ""
+"ਇਹ ਫੰਕਸ਼ਨ ਸਕੈਨਰ ਅਤੇ ਹੋਰ ਚਿੱਤਰ ਲੈਣਯੋਗ ਜੰਤਰਾਂ ਨੂੰ SANE (ਸਕੈਨਰ ਅਸੈੱਸ ਨਾਓ ਈਜ਼ਿ) ਇੰਟਰਫੇਸ ਰਾਹੀਂ ਵਰਤਦਾ "
+"ਹੈ।"
+
+#. Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/"
+#. XSANE_GIMP_MENU_DIALOG
+msgid "<Toolbox>/File/Acquire/XSane: Device dialog..."
+msgstr "<Toolbox>/ਫਾਇਲ/ਲਵੋ/XSane: ਜੰਤਰ ਡਾਈਲਾਗ..."
+
+#. XSANE_GIMP_MENU
+msgid "<Toolbox>/File/Acquire/XSane: "
+msgstr "<Toolbox>/ਫਾਇਲ/ਲਵੋ/XSane: "
+
+#. XSANE_GIMP_MENU_DIALOG_OLD
+msgid "<Toolbox>/Xtns/XSane/Device dialog..."
+msgstr "<Toolbox>/Xtns/XSane/ਜੰਤਰ ਡਾਈਲਾਗ..."
+
+#. XSANE_GIMP_MENU_OLD
+msgid "<Toolbox>/Xtns/XSane/"
+msgstr "<Toolbox>/Xtns/XSane/"
+
+#. HELP_NO_DEVICES
+msgid ""
+"Possible reasons:\n"
+"1) There really is no device that is supported by SANE\n"
+"2) Supported devices are busy\n"
+"3) The permissions for the device file do not allow you to use it - try as "
+"root\n"
+"4) The backend is not loaded by SANE (man sane-dll)\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
+"6) Possibly there is more than one SANE version installed"
+msgstr ""
+"ਸੰਭਵ ਕਾਰਨ ਹਨ:\n"
+"1) SANE ਵਲੋਂ ਸਹਿਯੋਗ ਪ੍ਰਾਪਤ ਕੋਈ ਜੰਤਰ ਹੈ ਹੀ ਨਹੀਂ\n"
+"2) ਸਹਿਯੋਗੀ ਜੰਤਰ ਰੁੱਝਿਆ ਹੋਇਆ ਹੈ\n"
+"3) ਜੰਤਰ ਫਾਇਲ ਲਈ ਅਧਿਕਾਰ ਤਾਹਨੂੰ ਵਰਤਣ ਨਹੀਂ ਦੇ ਰਹੇ ਹਨ - root ਵਾਂਗ ਵਰਤੋਂ\n"
+"4) SANE ਵਲੋਂ ਬੈਕਐਂਡ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ (man sane-dll)\n"
+"5) ਬੈਕਐਂਡ ਠੀਕ ਤਰ੍ਹਾਂ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ (man sane-\"backendname\")\n"
+"6) ਸੰਭਵ ਤੌਰ ਉੱਤੇ ਇੱਕ ਤੋਂ ਵੱਧ SANE ਵਰਜਨ ਇੰਸਟਾਲ ਹਨ"
+
+#. strings that are used in structures, so it is not allowed to use _()/gettext() here
+#. gettext_noop does mark these texts but does not change the string
+#. MENU_ITEM_SURFACE_FULL_SIZE
+msgid "full size"
+msgstr "ਪੂਰਾ ਆਕਾਰ"
+
+#. MENU_ITEM_SURFACE_DIN_A3P
+msgid "DIN A3 port."
+msgstr "DIN A3 ਪੋਰਟ ਹੈ।"
+
+#. MENU_ITEM_SURFACE_DIN_A3L
+msgid "DIN A3 land."
+msgstr "DIN A3 ਲੈਂਡ।"
+
+#. MENU_ITEM_SURFACE_DIN_A4P
+msgid "DIN A4 port."
+msgstr "DIN A4 ਪੋਰਟ।"
+
+#. MENU_ITEM_SURFACE_DIN_A4L
+msgid "DIN A4 land."
+msgstr "DIN A4 ਲੈਂਡ।"
+
+#. MENU_ITEM_SURFACE_DIN_A5P
+msgid "DIN A5 port."
+msgstr "DIN A5 ਪੋਰਟ।"
+
+#. MENU_ITEM_SURFACE_DIN_A5L
+msgid "DIN A5 land."
+msgstr "DIN A5 ਲੈਂਡ।"
+
+#. MENU_ITEM_SURFACE_13cmx18cm
+msgid "13cm x 18cm"
+msgstr "13cm x 18cm"
+
+#. MENU_ITEM_SURFACE_18cmx13cm
+msgid "18cm x 13cm"
+msgstr "18cm x 13cm"
+
+#. MENU_ITEM_SURFACE_10cmx15cm
+msgid "10cm x 15cm"
+msgstr "10cm x 15cm"
+
+#. MENU_ITEM_SURFACE_15cmx10cm
+msgid "15cm x 10cm"
+msgstr "15cm x 10cm"
+
+#. MENU_ITEM_SURFACE_9cmx13cm
+msgid "9cm x 13cm"
+msgstr "9cm x 13cm"
+
+#. MENU_ITEM_SURFACE_13cmx9cm
+msgid "13cm x 9cm"
+msgstr "13cm x 9cm"
+
+#. MENU_ITEM_SURFACE_legal_P
+msgid "legal port."
+msgstr "ਲੀਗਲ ਪੋਰਟ।"
+
+#. MENU_ITEM_SURFACE_legal_L
+msgid "legal land."
+msgstr "ਲੀਗਲ ਲੈਂਡ।"
+
+#. MENU_ITEM_SURFACE_letter_P
+msgid "letter port."
+msgstr "ਲੈਟਰ ਪੋਰਟ।"
+
+#. MENU_ITEM_SURFACE_letter_L
+msgid "letter land."
+msgstr "ਲੈਟਰ ਲੈਂਡ।"
+
+#. MENU_ITEM_MEDIUM_FULL_COLOR_RANGE
+msgid "Full color range"
+msgstr "ਪੂਰੀ ਰੰਗ ਰੇਜ਼"
+
+#. MENU_ITEM_MEDIUM_SLIDE
+msgid "Slide"
+msgstr "ਸਲਾਇਡ"
+
+#. MENU_ITEM_MEDIUM_STANDARD_NEG
+msgid "Standard negative"
+msgstr "ਸਟੈਂਡਰਡ ਨੈਗਟਿਵ"
+
+#. MENU_ITEM_MEDIUM_AGFA_NEG
+msgid "Agfa negative"
+msgstr "Agfa ਨੈਗਟਿਵ"
+
+#. MENU_ITEM_MEDIUM_AGFA_NEG_XRG200_4
+msgid "Agfa negative XRG 200-4"
+msgstr "Agfa ਨੈਗਟਿਵ XRG 200-4"
+
+#. MENU_ITEM_MEDIUM_AGFA_NEG_HDC_100
+msgid "Agfa negative HDC 100"
+msgstr "Agfa ਨੈਗਟਿਵ HDC 100"
+
+#. MENU_ITEM_MEDIUM_FUJI_NEG
+msgid "Fuji negative"
+msgstr "Fuji ਨੈਗਟਿਵ"
+
+#. MENU_ITEM_MEDIUM_KODAK_NEG
+msgid "Kodak negative"
+msgstr "Kodak ਨੈਗਟਿਵ"
+
+#. MENU_ITEM_MEDIUM_KONICA_NEG
+msgid "Konica negative"
+msgstr "Konica ਨੈਗਟਿਵ"
+
+#. MENU_ITEM_MEDIUM_KONICA_NEG_VX_100
+msgid "Konica negative VX 100"
+msgstr "Konica ਨੈਗਟਿਵ VX 100"
+
+#. MENU_ITEM_MEDIUM_ROSSMANN_NEG_HR_100
+msgid "Rossmann negative HR 100"
+msgstr "Rossmann ਨੈਗਟਿਵ HR 100"
+
+#. TEXT_PROJECT_STATUS_NOT_CREATED
+msgid "Project not created"
+msgstr "ਪ੍ਰੋਜੈਕਟ ਬਣਾਇਆ ਨਹੀਂ ਗਿਆ"
+
+#. TEXT_PROJECT_STATUS_CREATED
+msgid "Project created"
+msgstr "ਪ੍ਰੋਜੈਕਟ ਬਣਾਇਆ ਗਿਆ"
+
+#. TEXT_PROJECT_STATUS_CHANGED
+msgid "Project changed"
+msgstr "ਪ੍ਰੋਜੈਕਟ ਬਦਲਿਆ ਗਿਆ"
+
+#. TEXT_PROJECT_STATUS_ERR_READ_PROJECT
+msgid "Error reading project"
+msgstr "ਪ੍ਰੋਜੈਕਟ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+#. TEXT_PROJECT_STATUS_FILE_SAVING_ERROR
+msgid "Error saving file"
+msgstr "ਫਾਇਲ ਸੰਭਾਲ ਦੌਰਾਨ ਗਲਤੀ"
+
+#. TEXT_PROJECT_STATUS_FILE_SAVING
+msgid "Saving file"
+msgstr "ਫਾਇਲ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ"
+
+#. TEXT_PROJECT_STATUS_FILE_SAVING_ABORTED
+msgid "Aborted saving file"
+msgstr "ਫਾਇਲ ਸੰਭਾਲਣਾ ਅਧੂਰਾ ਛੱਡਿਆ"
+
+#. TEXT_PROJECT_STATUS_FILE_SAVED
+msgid "File has been saved"
+msgstr "ਫਾਇਲ ਸੰਭਾਲੀ ਗਈ ਹੈ"
+
+#. TEXT_EMAIL_STATUS_POP3_CONNECTION_FAILED
+msgid "POP3 connection failed"
+msgstr "POP3 ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ"
+
+#. TEXT_EMAIL_STATUS_POP3_LOGIN_FAILED
+msgid "POP3 login failed"
+msgstr "POP3 ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੋਇਆ"
+
+#. TEXT_EMAIL_STATUS_ASMTP_AUTH_FAILED
+msgid "ASMTP authentication failed"
+msgstr "ASMTP ਪਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੋਈ"
+
+#. TEXT_EMAIL_STATUS_SMTP_CONNECTION_FAILED
+msgid "SMTP connection failed"
+msgstr "SMTP ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ"
+
+#. TEXT_EMAIL_STATUS_SMTP_ERR_FROM
+msgid "From entry not accepted"
+msgstr "ਵਲੋਂ ਐਂਟਰੀ ਮਨਜ਼ੂਰ ਨਹੀਂ ਕੀਤੀ"
+
+#. TEXT_EMAIL_STATUS_SMTP_ERR_RCPT
+msgid "Receiver entry not accepted"
+msgstr "ਰਿਸੀਵਰ ਐਂਟਰੀ ਮਨਜ਼ੂਰ ਨਹੀਂ ਕੀਤੀ"
+
+#. TEXT_EMAIL_STATUS_SMTP_ERR_DATA
+msgid "E-mail data not accepted"
+msgstr "ਈਮੇਲ ਡਾਟਾ ਮਨਜ਼ੂਰ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"
+
+#. TEXT_EMAIL_STATUS_SENDING
+msgid "Sending e-mail"
+msgstr "ਈਮੇਲ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ"
+
+#. TEXT_EMAIL_STATUS_SENT
+msgid "E-mail has been sent"
+msgstr "ਈਮੇਲ ਭੇਜੀ ਗਈ"
+
+#. TEXT_FAX_STATUS_QUEUEING_FAX
+msgid "Queueing fax"
+msgstr "ਫੈਕਸ ਕਿਊਇੰਗ"
+
+#. TEXT_FAX_STATUS_FAX_QUEUED
+msgid "Fax is queued"
+msgstr "ਫੈਕਸ ਕਤਾਰਬੱਧ ਹੈ"
+
+#. Sane backend messages
+msgid "flatbed scanner"
+msgstr "ਫਲੈਟਬੈਡ ਸਕੈਨਰ"
+
+msgid "frame grabber"
+msgstr "ਫਰੇਮ ਗਰੱਬਰ"
+
+msgid "handheld scanner"
+msgstr "ਹੈਂਡ-ਹੈਂਲਡ ਸਕੈਨਰ"
+
+msgid "still camera"
+msgstr "ਸਟਿੱਲ ਕੈਮਰਾ"
+
+msgid "video camera"
+msgstr "ਵੀਡਿਓ ਕੈਮਰਾ"
+
+msgid "virtual device"
+msgstr "ਵੁਰਚੁਅਲ ਜੰਤਰ"
+
+msgid "Success"
+msgstr "ਸਫ਼ਲ"
+
+msgid "Operation not supported"
+msgstr "ਓਪਰੇਸ਼ਨ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+
+msgid "Operation was cancelled"
+msgstr "ਓਪਰੇਸ਼ਨ ਰੱਦ ਕੀਤਾ ਗਿਆ"
+
+msgid "Device busy"
+msgstr "ਜੰਤਰ ਰੁੱਝਿਆ ਹੋਇਆ ਹੈ"
+
+msgid "Invalid argument"
+msgstr "ਗਲਤ ਮੁੱਲ"
+
+msgid "End of file reached"
+msgstr "ਫਾਇਲ ਦਾ ਅੰਤ ਆ ਗਿਆ"
+
+msgid "Document feeder jammed"
+msgstr "ਦਸਤਾਵੇਜ਼ ਫੀਡਰ ਜਾਮ ਹੋ ਗਿਆ"
+
+msgid "Document feeder out of documents"
+msgstr "ਦਸਤਾਵੇਜ਼ ਫੀਡਰ ਵਿੱਚ ਦਸਤਾਵੇਜ਼ ਖਤਮ ਹੋ ਗਏ"
+
+msgid "Scanner cover is open"
+msgstr "ਸਕੈਨਰ ਢੱਕਣ ਖੁੱਲ੍ਹਾ ਹੈ"
+
+msgid "Error during device I/O"
+msgstr "ਜੰਤਰ I/O ਦੌਰਾਨ ਗਲਤੀ"
+
+msgid "Out of memory"
+msgstr "ਮੈਮੋਰੀ ਤੋਂ ਬਾਹਰ"
+
+msgid "Access to resource has been denied"
+msgstr "ਸਰੋਤ ਲਈ ਪਹੁੰਚ ਪਾਬੰਦੀ ਹੈ"
diff --git a/po/pl.gmo b/po/pl.gmo
index a455892..6a5d498 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index c3c7c2c..2d91422 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2005-12-22 01:26+0100\n"
 "Last-Translator: Jerzy Szczudlowski <jerzy@jedwab.net.pl>\n"
 "Language-Team: polski <pl@li.org>\n"
@@ -88,7 +88,8 @@ msgid "rename fax page"
 msgstr "zmień nazwę strony faksu"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "wstaw plik postscriptowy do faksu"
 
 #. WINDOW_EMAIL_PROJECT
@@ -507,7 +508,8 @@ msgid "Skip existing filenames"
 msgstr "Pomiń istniejące nazwy plików"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+#, fuzzy
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr "Zapis Postscriptu kompresowanego zlib (poziom PS 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -515,7 +517,8 @@ msgid "Save PDF zlib compressed"
 msgstr "Zapis PDF skompresowanego zlib"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Zapisz 16-bitowe obrazki pnm w formacie ASCII"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -539,8 +542,9 @@ msgstr "Użyj własnej mapy kolorów"
 msgid "Autoenhance gamma"
 msgstr "Samoczynnie poprawiaj parametr gamma"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Wybierz obszar skanowania po podglądzie"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -564,10 +568,6 @@ msgstr "szukam podłączonych urządzeń"
 msgid "Available devices:"
 msgstr "Dostępne urządzenia:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Opcje XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Typ"
@@ -895,53 +895,72 @@ msgstr "Polecenie:"
 msgid "Copy number option:"
 msgstr "Opcja ilości kopii:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Ustaw rozdzielczość skanowania"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Rozdzielczość w trybie kreski (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Rozdzielczość w skali szarości (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Rozdzielczość w kolorze (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Szerokość"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Wysokość"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Lewy margines"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Dolny margines"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Gamma drukarki - czerwony:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Wartość gamma drukarki:"
+#, fuzzy
+msgid "common value"
+msgstr "Obecne wartości:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Gamma drukarki - czerwony:"
+#, fuzzy
+msgid "red"
+msgstr "odczyt"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Gamma drukarki - zielony:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Gamma drukarki - niebieski:"
+#, fuzzy
+msgid "blue"
+msgstr "Rozmyj"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -958,7 +977,8 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr "Stwórz obraz Postscript skompresowany zlib (poziom PS 3) do druku"
 
 #. TEXT_SETUP_TMP_PATH
@@ -1081,8 +1101,25 @@ msgstr "Ustaw domyślne wartości dla programu:"
 msgid "Viewer (Postscript):"
 msgstr "Przeglądarka (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Szerokość"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Wysokość"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Lewy margines"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Dolny margines"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr "Stwórz obraz Postscript skompresowany zlib (poziom PS 3) dla faksu"
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1452,11 +1489,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "kompresja Huffmana CCITT 1D"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "kompresja faksu CCITT Group 3"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "kompresja faksu CCITT Group 4"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1583,8 +1622,9 @@ msgstr "Pobieranie danych %s"
 msgid "page"
 msgstr "strona"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Przesyłanie obrazka..."
 
 #. PROGRESS_ROTATING_DATA
@@ -1657,9 +1697,10 @@ msgstr ""
 "<Ctrl-m>, faks-<Ctrl-f> lub poczta-<Ctrl-e>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2018,14 +2059,16 @@ msgid "Browse for temporary directory"
 msgstr "Przeglądaj katalog tymczasowy"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Wyrażona w procentach jakość z jaką zostanie zapisany JPEG lub TIFF z "
 "kompresją JPEG"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Kompresja obrazka zapisanego jako png"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2033,19 +2076,23 @@ msgid "Minimum length of counter in filename"
 msgstr "Minimalna długość licznika w nazwie pliku"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+#, fuzzy
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Stopień kompresji zip przy zapisie jako TIFF (deflacja)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Typ kompresji przy zapisie jako TIFF 16 bit obrazka"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Typ kompresji przy zapisie jako TIFF 8 bit obrazka"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Typ kompresji przy zapisie jako TIFF obrazka w trybie kreski"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2079,10 +2126,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr "kompresuje obraz PDF alborytmem zlib (flatdecode)."
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Kiedy 16-bitowy obraz będzie zapisywany w formacie pnm użyj zapisu w formie "
@@ -2142,7 +2190,8 @@ msgid "Select how a range is displayed"
 msgstr "Wybierz jak ma być wyświetlany zakres"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Wartość przez którą wyliczona rozdzielczość podglądu jest mnożona"
 
 #. DESC_PREVIEW_GAMMA
@@ -2206,8 +2255,9 @@ msgstr ""
 "pipety"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Wprowadź polecenie, które zostanie wykonane do wyświetlenia plików pomocy "
 "(przeglądarka HTML)"
@@ -2216,8 +2266,9 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Zmień wartość gamma gdy przycisk autoulepszania jest wciśnięty"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "Wybierz obszar skanowania po pobraniu podglądu"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2308,28 +2359,34 @@ msgid "port to connect to POP3 server"
 msgstr "port serwera POP3"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+#, fuzzy
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "Poczta jest wysyłana w trybie HTML, umieść obrazek używając: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Wprowadź polecenie uruchomienia programu do OCR"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Podaj opcję programu do OCR wskazującą plik wejściowy"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Podaj opcję programu do OCR wskazującą plik wyjściowy"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Ustaw, jeśli program do OCR obsługuje graficzny pasek postępu"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Wprowadź opcję programu OCR by zdefiniować deskryptor pliku wyjściowego w "
 "trybie GUI"
@@ -2369,7 +2426,8 @@ msgid "Pick black point"
 msgstr "Wybierz ciemny punkt odniesienia"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Użyj pełnego obszaru skanowania"
 
 #. DESC_ZOOM_OUT
@@ -2393,12 +2451,14 @@ msgstr "Cofnij ostatnie powiększenie"
 msgid "Select visible area"
 msgstr "Wybierz obszar widzialny"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Automatycznie wybierz obszar skanowania"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Automatycznie rozszerz obszar skanowania"
 
 #. DESC_DELETE_IMAGES
@@ -2406,9 +2466,10 @@ msgid "Delete preview image cache"
 msgstr "Wyczyść pamięć podręczną podglądu obrazków"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Obszar ustawiony:\n"
@@ -2440,15 +2501,18 @@ msgid "Clone image"
 msgstr "Duplikuj obrazek"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Obróć obrazek o 90 stopni"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Obróć obrazek o 180 stopni"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Obróć obrazek o 270 stopni"
 
 #. DESC_MIRROR_X
@@ -2484,11 +2548,13 @@ msgid "Y-Scale factor"
 msgstr "Współczynnik powiększenia (Y)"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Przeskaluj obrazek do długości [piksele]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Przeskaluj obrazek do wysokości [piksele]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2610,7 +2676,8 @@ msgid "Failed to open"
 msgstr "Otwarcie nie powiodło się"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr ""
 "Nie można było utworzyć bezpiecznego pliku (być może istnieje dowiązanie):"
 
@@ -2690,8 +2757,9 @@ msgid "Failed to execute fax command:"
 msgstr "Nie powiodło się uruchomienie programu faksującego:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Nie powiodło się uruchomienie programu OCR:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Nie powiodło się uruchomienie programu faksującego:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2751,11 +2819,12 @@ msgid "warning: option has no value constraint"
 msgstr "uwaga: opcja nie posiada ograniczenia wartości"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Próbujesz uruchomić XSane jako ROOT, a to jest NIEBEZPIECZNE!\n"
@@ -3009,6 +3078,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr ""
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -3016,7 +3086,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Możliwe powody:\n"
@@ -3213,7 +3283,8 @@ msgid "E-mail has been sent"
 msgstr "Poczta została wysłana"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Kolejkowanie Faksu"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3275,6 +3346,24 @@ msgstr "Brak wolnej pamięci"
 msgid "Access to resource has been denied"
 msgstr "Brak dostępu do zasobu"
 
+#~ msgid "XSane options"
+#~ msgstr "Opcje XSane"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Nie powiodło się uruchomienie programu OCR:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Rozdzielczość w kolorze (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Wartość gamma drukarki:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Gamma drukarki - zielony:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Gamma drukarki - niebieski:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Usuń drukarkę"
diff --git a/po/pt.gmo b/po/pt.gmo
index e226187..1937146 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index 1d3e6ee..7acf6ed 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2004-10-08 22:00+3\n"
 "Last-Translator: Yujo Rodrigues <yujo@comp.ufu.br>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -83,7 +83,8 @@ msgid "rename fax page"
 msgstr "renomeia página de fax"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "insere arquivo-ps em um fax"
 
 #. WINDOW_EMAIL_PROJECT
@@ -508,7 +509,7 @@ msgid "Skip existing filenames"
 msgstr "Pular arquivos existentes"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -516,7 +517,8 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Salvar pnm 16bits em formato ascii"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -540,8 +542,9 @@ msgstr "Usar mapa de cores particular"
 msgid "Autoenhance gamma"
 msgstr "Alto realce gama"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Pré-seleciona área de digitalização"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -565,10 +568,6 @@ msgstr "procurando por dispositivos"
 msgid "Available devices:"
 msgstr "Dispositivos disponíveis:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Opções do XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Tipo"
@@ -900,53 +899,72 @@ msgstr "Comando:"
 msgid "Copy number option:"
 msgstr "Opção de número de cópias:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Escolha a resolução"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Resolução de linha artística (ppp):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Resolução de tons de cinza (ppp):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Resolução de cores (ppp):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Largura:"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Altura:"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Deslocamento esquerdo"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Deslocamento inferior"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Vermelho gama da impressora:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Valor de impressora gama:"
+#, fuzzy
+msgid "common value"
+msgstr "Valores recentes:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Vermelho gama da impressora:"
+#, fuzzy
+msgid "red"
+msgstr "ler"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Verde gama da Impressora:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Azul gama da Impressora:"
+#, fuzzy
+msgid "blue"
+msgstr "Embaçar"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -963,7 +981,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1087,8 +1105,24 @@ msgstr "Configura os padrões do programa para:"
 msgid "Viewer (Postscript):"
 msgstr "Visualizador (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Largura:"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Altura:"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Deslocamento esquerdo"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Deslocamento inferior"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1460,11 +1494,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "Compressão Huffman CCITT 1D"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "Compressão Fax CCITT Grupo 3"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "Compressão Fax CCITT Grupo 4"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1593,8 +1629,9 @@ msgstr "Recebendo dados %s"
 msgid "page"
 msgstr "pacote"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Transferindo imagem"
 
 #. PROGRESS_ROTATING_DATA
@@ -1668,9 +1705,10 @@ msgstr ""
 "<Ctrl-m>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2028,14 +2066,16 @@ msgid "Browse for temporary directory"
 msgstr "Procurar pelo diretório temporário"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Qualidade em porcentagem se a imagem é salvada como jpeg ou tiff com "
 "compressão jpeg"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Compressão se imagem é salvada como png"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2044,19 +2084,22 @@ msgstr "Comprimento mínimo do contador no nome de arquivo"
 
 #. DESC_TIFF_ZIP_COMPRESSION
 #, fuzzy
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Tipo de compressão se imagem de 8 bits é salvada como tiff"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Tipo de compressão se imagem de 16 bits é salvada como tiff"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Tipo de compressão se imagem de 8 bits é salvada como tiff"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Tipo de compressão se imagem em linha artística é salvada como tiff"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2087,10 +2130,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Quando uma imagem 16 bits deve ser salvada em formato pnm então use formato "
@@ -2151,7 +2195,8 @@ msgid "Select how a range is displayed"
 msgstr "Selecione como a extensão é exibida"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Valor com o qual a resolução prévia calculada é multiplicada"
 
 #. DESC_PREVIEW_GAMMA
@@ -2220,8 +2265,9 @@ msgstr ""
 "pipeta"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Entra comando a ser executado para abrir um visualizador html para exibir "
 "arquivos de ajuda"
@@ -2231,8 +2277,9 @@ msgid "Change gamma value when autoenhancement button is pressed"
 msgstr ""
 "Modifica o valor gama quando o botão de realce altomático esta pressionado"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr ""
 "Seleciona área de digitalização após a pré-visualização ter sido concluída"
 
@@ -2326,28 +2373,33 @@ msgstr "porta para conectar no servidor POP3"
 
 #. DESC_HTML_EMAIL
 #, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "Correio é enviado no modo html, com imagem: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Entra comando para iniciar o programa de ocr"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Entra opção do programa de ocr para definir o arquivo de entrada"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Entra opção do programa ocr para definir o arquivo de saída"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Define se o programa de ocr suporta a barra gráfica de progressão"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Entre com a opção do programa ocr para definir a saída do descritor de "
 "arquivos no modo GUI"
@@ -2387,7 +2439,8 @@ msgid "Pick black point"
 msgstr "Pega ponto preto"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Usa toda area de digitalização"
 
 #. DESC_ZOOM_OUT
@@ -2411,12 +2464,14 @@ msgstr "Desfazer último ampliamento"
 msgid "Select visible area"
 msgstr "Seleciona área visível"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Auto seleciona área de digitalização"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Obtém automaticamente a área de digitalização"
 
 #. DESC_DELETE_IMAGES
@@ -2424,9 +2479,10 @@ msgid "Delete preview image cache"
 msgstr "Apaga cache de imagem pré-visualizada"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Área pré-configurada:\n"
@@ -2458,15 +2514,18 @@ msgid "Clone image"
 msgstr "Clona imagem"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Rotaciona imagem em 90 graus"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Rotaciona imagem em 180 graus"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Rotaciona imagem em 270 graus"
 
 #. DESC_MIRROR_X
@@ -2502,11 +2561,13 @@ msgid "Y-Scale factor"
 msgstr "Fator de escala Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Dimensiona imagem para largura [em pontos]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Dimensiona imagem para altura [em pontos]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2628,7 +2689,8 @@ msgid "Failed to open"
 msgstr "Falha ao abrir"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Não foi possível criar arquivo seguro (talvez o link não existe);"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2705,8 +2767,9 @@ msgid "Failed to execute fax command:"
 msgstr "Falha ao executar o comando de fax:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Falha ao executar o comando para ocr:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Falha ao executar o comando de fax:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2766,11 +2829,12 @@ msgid "warning: option has no value constraint"
 msgstr "atenção: opção não tem o valor do construtor"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Você está tentando rodar XSane como ROOT, o que é realmente PERIGOSO!\n"
@@ -3026,6 +3090,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr ""
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -3033,7 +3098,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Possíveis motivos:\n"
@@ -3240,7 +3305,8 @@ msgid "E-mail has been sent"
 msgstr "Correio foi enviado"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Enviado Fax para fila"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3302,6 +3368,24 @@ msgstr "Sem memória"
 msgid "Access to resource has been denied"
 msgstr "Acesso ao recurso foi proibido"
 
+#~ msgid "XSane options"
+#~ msgstr "Opções do XSane"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Falha ao executar o comando para ocr:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Resolução de cores (ppp):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Valor de impressora gama:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Verde gama da Impressora:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Azul gama da Impressora:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Excluir impressora"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 306f315..2d06b2e 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a4489d2..c42d766 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2004-10-08 22:00+3\n"
 "Last-Translator: Yujo Rodrigues <yujo@comp.ufu.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -83,7 +83,8 @@ msgid "rename fax page"
 msgstr "renomeia página de fax"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "insere arquivo-ps em um fax"
 
 #. WINDOW_EMAIL_PROJECT
@@ -508,7 +509,7 @@ msgid "Skip existing filenames"
 msgstr "Pular arquivos existentes"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -516,7 +517,8 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Salvar pnm 16bits em formato ascii"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -540,8 +542,9 @@ msgstr "Usar mapa de cores particular"
 msgid "Autoenhance gamma"
 msgstr "Alto realce gama"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Pré-seleciona área de digitalização"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -565,10 +568,6 @@ msgstr "procurando por dispositivos"
 msgid "Available devices:"
 msgstr "Dispositivos disponíveis:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Opções do XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Tipo"
@@ -900,53 +899,72 @@ msgstr "Comando:"
 msgid "Copy number option:"
 msgstr "Opção de número de cópias:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Escolha a resolução"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Resolução de linha artística (ppp):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Resolução de tons de cinza (ppp):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Resolução de cores (ppp):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Largura:"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Altura:"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Deslocamento esquerdo"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Deslocamento inferior"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Vermelho gama da impressora:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Valor de impressora gama:"
+#, fuzzy
+msgid "common value"
+msgstr "Valores recentes:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Vermelho gama da impressora:"
+#, fuzzy
+msgid "red"
+msgstr "ler"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Verde gama da Impressora:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Azul gama da Impressora:"
+#, fuzzy
+msgid "blue"
+msgstr "Embaçar"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -963,7 +981,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1087,8 +1105,24 @@ msgstr "Configura os padrões do programa para:"
 msgid "Viewer (Postscript):"
 msgstr "Visualizador (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Largura:"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Altura:"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Deslocamento esquerdo"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Deslocamento inferior"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1460,11 +1494,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "Compressão Huffman CCITT 1D"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "Compressão Fax CCITT Grupo 3"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "Compressão Fax CCITT Grupo 4"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1593,8 +1629,9 @@ msgstr "Recebendo dados %s"
 msgid "page"
 msgstr "pacote"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Transferindo imagem"
 
 #. PROGRESS_ROTATING_DATA
@@ -1668,9 +1705,10 @@ msgstr ""
 "<Ctrl-m>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2028,14 +2066,16 @@ msgid "Browse for temporary directory"
 msgstr "Procurar pelo diretório temporário"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Qualidade em porcentagem se a imagem é salvada como jpeg ou tiff com "
 "compressão jpeg"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Compressão se imagem é salvada como png"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2044,19 +2084,22 @@ msgstr "Comprimento mínimo do contador no nome de arquivo"
 
 #. DESC_TIFF_ZIP_COMPRESSION
 #, fuzzy
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Tipo de compressão se imagem de 8 bits é salvada como tiff"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Tipo de compressão se imagem de 16 bits é salvada como tiff"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Tipo de compressão se imagem de 8 bits é salvada como tiff"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Tipo de compressão se imagem em linha artística é salvada como tiff"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2087,10 +2130,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Quando uma imagem 16 bits deve ser salvada em formato pnm então use formato "
@@ -2151,7 +2195,8 @@ msgid "Select how a range is displayed"
 msgstr "Selecione como a extensão é exibida"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Valor com o qual a resolução prévia calculada é multiplicada"
 
 #. DESC_PREVIEW_GAMMA
@@ -2220,8 +2265,9 @@ msgstr ""
 "pipeta"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Entra comando a ser executado para abrir um visualizador html para exibir "
 "arquivos de ajuda"
@@ -2231,8 +2277,9 @@ msgid "Change gamma value when autoenhancement button is pressed"
 msgstr ""
 "Modifica o valor gama quando o botão de realce altomático esta pressionado"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr ""
 "Seleciona área de digitalização após a pré-visualização ter sido concluída"
 
@@ -2326,28 +2373,33 @@ msgstr "porta para conectar no servidor POP3"
 
 #. DESC_HTML_EMAIL
 #, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "Correio é enviado no modo html, com imagem: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Entra comando para iniciar o programa de ocr"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Entra opção do programa de ocr para definir o arquivo de entrada"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Entra opção do programa ocr para definir o arquivo de saída"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Define se o programa de ocr suporta a barra gráfica de progressão"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Entre com a opção do programa ocr para definir a saída do descritor de "
 "arquivos no modo GUI"
@@ -2387,7 +2439,8 @@ msgid "Pick black point"
 msgstr "Pega ponto preto"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Usa toda area de digitalização"
 
 #. DESC_ZOOM_OUT
@@ -2411,12 +2464,14 @@ msgstr "Desfazer último ampliamento"
 msgid "Select visible area"
 msgstr "Seleciona área visível"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Auto seleciona área de digitalização"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Obtém automaticamente a área de digitalização"
 
 #. DESC_DELETE_IMAGES
@@ -2424,9 +2479,10 @@ msgid "Delete preview image cache"
 msgstr "Apaga cache de imagem pré-visualizada"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Área pré-configurada:\n"
@@ -2458,15 +2514,18 @@ msgid "Clone image"
 msgstr "Clona imagem"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Rotaciona imagem em 90 graus"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Rotaciona imagem em 180 graus"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Rotaciona imagem em 270 graus"
 
 #. DESC_MIRROR_X
@@ -2502,11 +2561,13 @@ msgid "Y-Scale factor"
 msgstr "Fator de escala Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Dimensiona imagem para largura [em pontos]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Dimensiona imagem para altura [em pontos]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2628,7 +2689,8 @@ msgid "Failed to open"
 msgstr "Falha ao abrir"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Não foi possível criar arquivo seguro (talvez o link não existe);"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2705,8 +2767,9 @@ msgid "Failed to execute fax command:"
 msgstr "Falha ao executar o comando de fax:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Falha ao executar o comando para ocr:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Falha ao executar o comando de fax:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2766,11 +2829,12 @@ msgid "warning: option has no value constraint"
 msgstr "atenção: opção não tem o valor do construtor"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Você está tentando rodar XSane como ROOT, o que é realmente PERIGOSO!\n"
@@ -3026,6 +3090,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr ""
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -3033,7 +3098,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Possíveis motivos:\n"
@@ -3240,7 +3305,8 @@ msgid "E-mail has been sent"
 msgstr "Correio foi enviado"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Enviado Fax para fila"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3302,6 +3368,24 @@ msgstr "Sem memória"
 msgid "Access to resource has been denied"
 msgstr "Acesso ao recurso foi proibido"
 
+#~ msgid "XSane options"
+#~ msgstr "Opções do XSane"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Falha ao executar o comando para ocr:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Resolução de cores (ppp):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Valor de impressora gama:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Verde gama da Impressora:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Azul gama da Impressora:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Excluir impressora"
diff --git a/po/ro.gmo b/po/ro.gmo
index c7e1151..ddf371d 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 2d13acf..c2ba73d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2004-08-27 19:55+0300\n"
 "Last-Translator: \n"
 "Language-Team:  <C@li.org>\n"
@@ -85,7 +85,8 @@ msgid "rename fax page"
 msgstr "Redenumeşte pagina de fax"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "Introduce fişier ps în fax"
 
 #. WINDOW_EMAIL_PROJECT
@@ -510,7 +511,7 @@ msgid "Skip existing filenames"
 msgstr "Salt peste fişierele existente"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -518,7 +519,8 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Salvează pnm 16 biţi în format ascii"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -542,8 +544,9 @@ msgstr "Foloseşte harta de culori personală"
 msgid "Autoenhance gamma"
 msgstr "Îmbunătăţire automată gamma"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Preselectare zonă de scanare"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -567,10 +570,6 @@ msgstr "Caut dispozitivele"
 msgid "Available devices:"
 msgstr "Dispozitive disponibile"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Opţiuni XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Tip"
@@ -903,53 +902,72 @@ msgstr "Comandă:"
 msgid "Copy number option:"
 msgstr "Opţiune număr de cópii:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Setează rezoluţia de scanare"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Rezoluţie alb/negru (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Rezoluţie scară de gri (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Rezoluţie color (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Lăţime"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Înălţime"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Decalaj stânga"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Decalaj jos"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Gamma - componentă roşu - pt. imprimantă"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Valoare gamma imprimantă:"
+#, fuzzy
+msgid "common value"
+msgstr "Valori recente:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Gamma - componentă roşu - pt. imprimantă"
+#, fuzzy
+msgid "red"
+msgstr "citire"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Gamma - componentă verde - pt. imprimantă"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Gamma - componentă albastru - pt. imprimantă"
+#, fuzzy
+msgid "blue"
+msgstr "Difuzie"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -966,7 +984,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1090,8 +1108,24 @@ msgstr "Setează valori implicite în program pt.:"
 msgid "Viewer (Postscript):"
 msgstr "Vizualizator (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Lăţime"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Înălţime"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Decalaj stânga"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Decalaj jos"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1463,11 +1497,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "Compresie CCITT 1D Huffmann"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "Compresie CCITT Grup 3 Huffmann"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "Compresie CCITT Grup 4 Huffmann"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1596,8 +1632,9 @@ msgstr "Primesc date %s"
 msgid "page"
 msgstr "Pachet"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Transfer imaginea"
 
 #. PROGRESS_ROTATING_DATA
@@ -1671,9 +1708,10 @@ msgstr ""
 "mail-<Ctrl-m>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2031,14 +2069,16 @@ msgid "Browse for temporary directory"
 msgstr "Navighează la directorul temporar"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Calitatea în procente dacă imaginea este salvată ca JPEG sau TIFF cu "
 "compresie JPEG"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Compresie dacă imaginea este salvată ca PNG"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2047,19 +2087,22 @@ msgstr "Lungimea minimă a contorului în numele fişierului"
 
 #. DESC_TIFF_ZIP_COMPRESSION
 #, fuzzy
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Tip compresie dacă o imagine de 8 biţi este salvată ca TIFF"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Tip compresie dacă o imagine de 16 biţi este salvată ca TIFF"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Tip compresie dacă o imagine de 8 biţi este salvată ca TIFF"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Tip compresie dacă o imagine alb/negru este salvată ca TIFF"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2090,10 +2133,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Folosiţi formatul ascii în locul celui binar pentru a salva imaginile pe 16 "
@@ -2156,7 +2200,8 @@ msgid "Select how a range is displayed"
 msgstr "Selectare mod de afişare a gamei"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Valoarea cu care este înmulţită rezoluţia calculată pt. previzualizare"
 
 #. DESC_PREVIEW_GAMMA
@@ -2227,8 +2272,9 @@ msgid "dimension of square that is used to average color for pipette function"
 msgstr "dimensiunea pătratului folosit la medierea culorii pt. funcţia pipetă"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Introduceţi comanda ce va fi executată pentru afişarea fişierelor ajutor, "
 "trebuie să fie un vizualizator de HTML!"
@@ -2237,8 +2283,9 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Schimbă valoarea gamma la apasarea butonului de îmbunătăţire automată"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "Selectează zona de scanare după terminarea scanării pt. previzualizare"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2330,30 +2377,35 @@ msgstr "portul de conectare la serverul POP3"
 
 #. DESC_HTML_EMAIL
 #, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "Poşta trimisă în mod HTML va afişa imaginile cu <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr ""
 "Introduceţi comanda ce va fi executată pt. a porni recunoaşterea optică a "
 "caracterelor (OCR)"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Introduceţi opţiunea programului OCR ce defineşte fişierul de intrare"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Introduceţi opţiunea programului OCR ce defineşte fişierul de ieşire"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Defineşte dacă programul OCR susţine GUI de evoluţie prin pipe"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Introduceţi opţiunea programului OCR ce defineşte descriptorul fişierului de "
 "ieşire în mod GUI"
@@ -2392,7 +2444,8 @@ msgid "Pick black point"
 msgstr "Preia punctul de negru"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Foloseşte toată zona de scanare"
 
 #. DESC_ZOOM_OUT
@@ -2416,12 +2469,14 @@ msgstr "Anulează ultima mărire"
 msgid "Select visible area"
 msgstr "Selectează zona vizibilă"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Selectare automată zonă de scanare"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Ridică automat zona de scanare"
 
 #. DESC_DELETE_IMAGES
@@ -2429,9 +2484,10 @@ msgid "Delete preview image cache"
 msgstr "Şterge imaginea previzualizată tampon"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Zona predefinită:\n"
@@ -2463,15 +2519,18 @@ msgid "Clone image"
 msgstr "Clonează imaginea"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Roteşte imaginea cu 90°"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Roteşte imaginea cu 180°"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Roteşte imaginea cu 270°"
 
 #. DESC_MIRROR_X
@@ -2507,11 +2566,13 @@ msgid "Y-Scale factor"
 msgstr "Factor scalare Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Scalare imagine (la lăţime) [în pixeli]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Scalare imagine (la înălţime) [în pixeli]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2633,7 +2694,8 @@ msgid "Failed to open"
 msgstr "Nu am putut deschide"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Nu am putut crea fişierul în siguranţă (poate există o legătură):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2710,8 +2772,9 @@ msgid "Failed to execute fax command:"
 msgstr "Nu am putut executa comanda de fax:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Nu am putut executa comanda de OCR:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Nu am putut executa comanda de fax:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2771,11 +2834,12 @@ msgid "warning: option has no value constraint"
 msgstr "atenţie: opţiunea nu are constrângeri pt. valoare"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Încercaţi să rulaţi XSane ca root, ceea ce este PERICULOS!\n"
@@ -3028,6 +3092,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Toolbox>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -3035,7 +3100,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Cauze posibile:\n"
@@ -3242,7 +3307,8 @@ msgid "E-mail has been sent"
 msgstr "Mailul a fost trimis"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Faxul este trimis în coadă"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3304,6 +3370,24 @@ msgstr "Nu am memorie suficientă."
 msgid "Access to resource has been denied"
 msgstr "Accesul la resursă a fost respins"
 
+#~ msgid "XSane options"
+#~ msgstr "Opţiuni XSane"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Nu am putut executa comanda de OCR:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Rezoluţie color (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Valoare gamma imprimantă:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Gamma - componentă verde - pt. imprimantă"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Gamma - componentă albastru - pt. imprimantă"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Şterge imprimantă"
diff --git a/po/ru.gmo b/po/ru.gmo
index a830288..f99aeb1 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index ace6ef9..5d98562 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2005-12-31 15:46+0300\n"
 "Last-Translator: Vitaly Lipatov <lav@etersoft.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -87,7 +87,8 @@ msgid "rename fax page"
 msgstr "переименование факсимильной страницы"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "добавление PS-файла в факсимильное послание"
 
 #. WINDOW_EMAIL_PROJECT
@@ -506,7 +507,8 @@ msgid "Skip existing filenames"
 msgstr "Пропускать существующие"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+#, fuzzy
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr "Сохранять Postscript (level 3) сжатым с помощью zlib"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -514,7 +516,8 @@ msgid "Save PDF zlib compressed"
 msgstr "Сохранять PDF сжатым с помощью zlib"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Сохранять 16-битные pnm в формате ASCII"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -538,8 +541,9 @@ msgstr "Использовать собственную цветовую таб�
 msgid "Autoenhance gamma"
 msgstr "Автоподбор гаммы"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Автовыбор области сканирования"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -563,10 +567,6 @@ msgstr "Поиск устройств"
 msgid "Available devices:"
 msgstr "Доступные устройства:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Общие параметры"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Формат"
@@ -892,53 +892,72 @@ msgstr "Команда:"
 msgid "Copy number option:"
 msgstr "Параметр для количества копий:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Выбор разрешения сканирования"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Разрешение для штрихового изображения (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Разрешение для чёрно-белого изображения (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Разрешение для цветного изображения (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Ширина"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Высота"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Отступ слева"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Отступ снизу"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Значение красного компонента гаммы для принтера:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Значение гаммы для принтера:"
+#, fuzzy
+msgid "common value"
+msgstr "Последние значения:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Значение красного компонента гаммы для принтера:"
+#, fuzzy
+msgid "red"
+msgstr "чтение"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Значение зелёного компонента гаммы для принтера:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Значение синего компонента гаммы для принтера:"
+#, fuzzy
+msgid "blue"
+msgstr "Размыть"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -955,7 +974,8 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr "Создать Postscript (level 3) для печати, сжатый zlib"
 
 #. TEXT_SETUP_TMP_PATH
@@ -1078,8 +1098,25 @@ msgstr "Установить умолчания для:"
 msgid "Viewer (Postscript):"
 msgstr "Программа просмотра PostScript-файлов:"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Ширина"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Высота"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Отступ слева"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Отступ снизу"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr "Создать Postscript (level 3), сжатый zlip, для отправки по факсу"
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1446,11 +1483,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "сжатие CCITT 1D Huffman"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "сжатие CCITT Group 3 Fax"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "сжатие CCITT Group 4 Fax"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1576,8 +1615,9 @@ msgstr "Приём данных %s"
 msgid "page"
 msgstr "страница"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Передача изображения"
 
 #. PROGRESS_ROTATING_DATA
@@ -1651,9 +1691,10 @@ msgstr ""
 "<Ctrl-e>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2013,12 +2054,14 @@ msgid "Browse for temporary directory"
 msgstr "Указать временный каталог"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr "Качество в процентах для формата JPEG или TIFF с JPEG-сжатием"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Сжатие для формата PNG"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2026,19 +2069,23 @@ msgid "Minimum length of counter in filename"
 msgstr "Минимальная длина счётчика в названии файла"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+#, fuzzy
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Степень сжатия для сжатых zip изображений TIFF (deflate)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Тип сжатия для формата TIFF при глубине цвета 16 бит"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Тип сжатия для формата TIFF при глубине цвета 8 бит"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Тип сжатия для формата TIFF при сохранении штриховых изображений"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2073,10 +2120,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr "сжимает изображение PDF по алгоритму zlib (flatdecode)."
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "При сохранении 16-битных изображений в формате pnm используйте текстовый "
@@ -2132,7 +2180,8 @@ msgid "Select how a range is displayed"
 msgstr "Выберите, как будет отображаться диапазон"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr ""
 "Значение, на которое умножается высчитанное разрешение для предварительного "
 "сканирования"
@@ -2203,8 +2252,9 @@ msgstr ""
 "цвета при его получении с помощью пипетки"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Команда для отображения файлов справки, должна уметь отображать файлы HTML"
 
@@ -2212,8 +2262,9 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Изменять значение гаммы при нажатии кнопки автоподбора значений"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr ""
 "Выделять область сканирования после завершения предварительного сканирования"
 
@@ -2303,31 +2354,37 @@ msgid "port to connect to POP3 server"
 msgstr "Порт для POP3-сервера"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+#, fuzzy
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr ""
 "Письмо отправлено в виде HTML-документа, размещение изображения: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Введите команду распознавания текста"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Параметр, указывающий входной файл программе распознавания текста"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Параметр, указывающий выходной файл программе распознавания текста"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr ""
 "Определяет, поддерживает ли программа распознавания текста GUI-канал степени "
 "выполнения"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Укажите параметр для программы распознавания текста, определяющий выходной "
 "файловый дескриптор в режиме GUI."
@@ -2368,7 +2425,8 @@ msgid "Pick black point"
 msgstr "Выбрать чёрную точку"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Использовать полную область сканирования"
 
 #. DESC_ZOOM_OUT
@@ -2392,12 +2450,14 @@ msgstr "Отменить последнее изменение масштаба"
 msgid "Select visible area"
 msgstr "Выбрать всю видимую область для сканирования"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Автоматически выбрать область сканирования"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Автоматически расширить область сканирования"
 
 #. DESC_DELETE_IMAGES
@@ -2405,9 +2465,10 @@ msgid "Delete preview image cache"
 msgstr "Удалить кэш изображений предварительного просмотра"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Область предварительных настроек:\n"
@@ -2439,15 +2500,18 @@ msgid "Clone image"
 msgstr "Сделать копию изображения"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Повернуть изображение на 90 градусов"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Повернуть изображение на 180 градусов"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Повернуть изображение на 270 градусов"
 
 #. DESC_MIRROR_X
@@ -2483,11 +2547,13 @@ msgid "Y-Scale factor"
 msgstr "Увеличение по оси Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Изменить размер изображения до ширины [в точках]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Изменить размер изображения до высоты [в точках]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2609,7 +2675,8 @@ msgid "Failed to open"
 msgstr "Невозможно открыть"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Невозможно создать секретный файл (возможно ссылка не существует):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2685,8 +2752,9 @@ msgid "Failed to execute fax command:"
 msgstr "Невозможно выполнить команду отправки факсимильного послания"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Невозможно выполнить команду распознавания текста:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Невозможно выполнить команду отправки факсимильного послания"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2746,11 +2814,12 @@ msgid "warning: option has no value constraint"
 msgstr "предупреждение: параметр не содержит значения"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Вы запускаете XSane как ROOT, что ОЧЕНЬ ОПАСНО!\n"
@@ -3004,6 +3073,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Toolbox>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -3011,7 +3081,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Возможные причины:\n"
@@ -3206,7 +3276,8 @@ msgid "E-mail has been sent"
 msgstr "Письмо было отправлено"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Помещаем факс в очередь на отправку"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3268,6 +3339,24 @@ msgstr "Не хватает памяти"
 msgid "Access to resource has been denied"
 msgstr "Доступ к ресурсу запрещён"
 
+#~ msgid "XSane options"
+#~ msgstr "Общие параметры"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Невозможно выполнить команду распознавания текста:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Разрешение для цветного изображения (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Значение гаммы для принтера:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Значение зелёного компонента гаммы для принтера:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Значение синего компонента гаммы для принтера:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Удалить описание принтера"
diff --git a/po/sk.gmo b/po/sk.gmo
index d447323..ad752c4 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index ad0b714..4fc0b25 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,22 +1,21 @@
-# translation of xsane.po to
+# Translation of xsane.po to Slovak
 # Slovak translation of sane
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-# Zdenko Podobný <zdpo@mailbox.sk>, 2001, 2004, 2005.
+# Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+# Zdenko Podobný <zdpo@mailbox.sk>, 2001, 2004, 2005, 2006, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xsane\n"
+"Project-Id-Version:  xsane-0.995-pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
-"PO-Revision-Date: 2005-11-01 18:58+0100\n"
-"Last-Translator: \n"
-"Language-Team:  <sk@li.org>\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
+"PO-Revision-Date: 2007-10-01 20:37+0200\n"
+"Last-Translator:  Zdenko Podobny <zdenop@gmail.com>\n"
+"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\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"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. Please translate this to the correct directory name (eg. german=>de)
 #. XSANE_LANGUAGE_DIR
@@ -78,47 +77,40 @@ msgid "fax project"
 msgstr "faxový projekt"
 
 #. WINDOW_FAX_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for fax project"
-msgstr "Vložte názov faxového projektu"
+msgstr "vyhľadať faxový projekt"
 
 #. WINDOW_FAX_RENAME
 msgid "rename fax page"
 msgstr "premenovať faxovú stránku"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+msgid "insert PS-file into fax"
 msgstr "vložiť ps-súbor do faxu"
 
 #. WINDOW_EMAIL_PROJECT
-#, fuzzy
 msgid "E-mail project"
-msgstr "poštový projekt"
+msgstr "E-mailový projekt"
 
 #. WINDOW_EMAIL_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for email project"
-msgstr "Vložte názov poštového projektu"
+msgstr "vyhľadať e-mailový projekt"
 
 #. WINDOW_EMAIL_RENAME
-#, fuzzy
 msgid "rename e-mail image"
-msgstr "premenovať obrázok do pošty"
+msgstr "premenovať e-mailový obrázok"
 
 #. WINDOW_EMAIL_INSERT
-#, fuzzy
 msgid "insert file into e-mail"
-msgstr "vložiť obrázok do pošty"
+msgstr "vložiť súbor do e-mailu"
 
 #. WINDOW_MULTIPAGE_PROJECT
-#, fuzzy
 msgid "multipage project"
-msgstr "Zmazať projekt"
+msgstr "viacstranový projekt"
 
 #. WINDOW_MULTIPAGE_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for multipage project"
-msgstr "Zmazať projekt"
+msgstr "vyhľadať viacstranový projekt"
 
 #. WINDOW_PRESET_AREA_RENAME
 msgid "rename preset area"
@@ -221,33 +213,28 @@ msgid "No devices available"
 msgstr "Nie je dostupné žiadne zariadenie"
 
 #. WINDOW_SCANNER_DEFAULT_COLOR_ICM_PROFILE
-#, fuzzy
 msgid "select scanner default color ICM-profile"
-msgstr "Zmazať tlačiareň"
+msgstr "Vybrať štandardný ICM-profil pre skener"
 
 #. WINDOW_SCANNER_DEFAULT_GRAY_ICM_PROFILE
-#, fuzzy
 msgid "select scanner default gray ICM-profile"
-msgstr "Zmazať tlačiareň"
+msgstr "Vybrať štandardný ICM-profil pre skener"
 
 #. WINDOW_DISPLAY_ICM_PROFILE
 msgid "select display ICM-profile"
-msgstr ""
+msgstr "vybrať ICM-profil obrazovky"
 
 #. WINDOW_CUSTOM_PROOFING_ICM_PROFILE
-#, fuzzy
 msgid "select custom proofing ICM-profile"
-msgstr "zvoľte názov pre výstupný súbor"
+msgstr ""
 
 #. WINDOW_WORKING_COLOR_SPACE_ICM_PROFILE
-#, fuzzy
 msgid "select working color space ICM-profile"
-msgstr "Zmazať tlačiareň"
+msgstr ""
 
 #. WINDOW_PRINTER_ICM_PROFILE
-#, fuzzy
 msgid "select printer ICM-profile"
-msgstr "Zmazať tlačiareň"
+msgstr "vybrať ICM profil pre tlačiareň"
 
 #. MENU_FILE
 msgid "File"
@@ -285,7 +272,7 @@ msgstr "Geometria"
 #. MENU_COLOR_MANAGEMENT
 #. NOTEBOOK_COLOR_MANAGEMENT_OPTIONS
 msgid "Color management"
-msgstr ""
+msgstr "Správa farieb"
 
 #. MENU_ITEM_ABOUT_XSANE
 msgid "About XSane"
@@ -450,9 +437,8 @@ msgid "Send project"
 msgstr "Poslať projekt"
 
 #. BUTTON_SAVE_MULTIPAGE
-#, fuzzy
 msgid "Save multipage file"
-msgstr "Uložiť obrázok"
+msgstr "Uložiť viacstranový súbor"
 
 #. BUTTON_DELETE_PROJECT
 msgid "Delete project"
@@ -495,9 +481,8 @@ msgid "Fine mode"
 msgstr "Jemný režim"
 
 #. RADIO_BUTTON_HTML_EMAIL
-#, fuzzy
 msgid "HTML e-mail"
-msgstr "HTML pošta"
+msgstr "HTML e-mail"
 
 #. RADIO_BUTTON_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device preferences at exit"
@@ -512,16 +497,16 @@ msgid "Skip existing filenames"
 msgstr "Preskočiť existujúce názvy súborov"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
-msgstr ""
+msgid "Save postscript zlib compressed (PS level 3)"
+msgstr "Použiť postcipt so zlib kompresiou (PS level 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
 msgid "Save PDF zlib compressed"
-msgstr ""
+msgstr "Uložiť PDF so zlib kompresiou"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
-msgstr "Uložiť 16 bitové pnm v ascii formáte"
+msgid "Save 16bit PNM in ASCII format"
+msgstr "Uložiť 16 bitové PNM v ASCII formáte"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
 msgid "Reduce 16 bit image to 8 bit"
@@ -532,9 +517,8 @@ msgid "Main window size fixed"
 msgstr "Pevná veľkosť hlavného okna"
 
 #. RADIO_BUTTON_DISABLE_GIMP_PREVIEW_GAMMA
-#, fuzzy
 msgid "Disable GIMP preview gamma"
-msgstr "Zakázať pre gimp gama náhľad"
+msgstr "Zakázať pre GIMP gama náhľad"
 
 #. RADIO_BUTTON_PRIVATE_COLORMAP
 msgid "Use private colormap"
@@ -544,8 +528,8 @@ msgstr "Použiť vlastnú farebnú mapu"
 msgid "Autoenhance gamma"
 msgstr "Automaticky upraviť gama"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+msgid "Preselect scan area"
 msgstr "Predvoľba skenovacej plochy"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -559,7 +543,7 @@ msgstr "Použiť GUI rúru postupu"
 #. RADIO_BUTTON_CMS_BPC
 #. MENU_ITEM_CMS_BLACK_POINT_COMPENSATION
 msgid "Black point compensation"
-msgstr ""
+msgstr "Kompenzácia čierneho boru"
 
 #. TEXT_SCANNING_DEVICES
 msgid "scanning for devices"
@@ -569,19 +553,14 @@ msgstr "hľadám zariadenia"
 msgid "Available devices:"
 msgstr "Dostupné zariadenia:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Nastavenia XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Typ"
 
 #. TEXT_CMS_FUNCTION
 #. DESC_CMS_FUNCTION
-#, fuzzy
 msgid "Color management function"
-msgstr "Celofarebný rozsah"
+msgstr "Funkcie správy farieb"
 
 #. TEXT_SCANNER_BACKEND
 msgid "Scanner and backend:"
@@ -656,13 +635,12 @@ msgid "16 bit output formats:"
 msgstr "16 bitové výstupné formáty:"
 
 #. TEXT_REDUCE_16BIT_TO_8BIT
-#, fuzzy
 msgid ""
 "Bit depth 16 bits/channel is not supported for this output format.\n"
 "Do you want to reduce the depth to 8 bits/channel?"
 msgstr ""
-"16 bitov na farbu nie je podporovaných v tomto výstupnom formát.\n"
-"Prajete si redukciu hĺbky na 8 bitov/farbu?"
+"16 bitov na kanál nie je podporovaných v tomto výstupnom formát.\n"
+"Prajete si redukciu hĺbky na 8 bitov/kanál?"
 
 #. TEXT_AUTHORIZATION_REQ
 msgid "Authorization required for"
@@ -697,9 +675,8 @@ msgid "package"
 msgstr "balík"
 
 #. TEXT_WITH_CMS_FUNCTION
-#, fuzzy
 msgid "with color management function"
-msgstr "Celofarebný rozsah"
+msgstr "s funkciami správy farieb"
 
 #. TEXT_WITH_GIMP_SUPPORT
 msgid "with GIMP support"
@@ -767,9 +744,8 @@ msgstr ""
 "PRE KONKRÉTNY ÚČEL.\n"
 
 #. TEXT_EMAIL_ADR
-#, fuzzy
 msgid "E-mail:"
-msgstr "Email:"
+msgstr "E-mail:"
 
 #. TEXT_HOMEPAGE
 msgid "Homepage:"
@@ -788,15 +764,14 @@ msgstr "Preklad:"
 #. by YOUR NAME\n
 #. E-mail: your.name@yourdomain.com\n
 #. TEXT_TRANSLATION_INFO
-#, fuzzy
 msgid ""
 "untranslated original english text\n"
 "by Oliver Rauch\n"
 "E-mail: Oliver.Rauch@rauch-domain.de\n"
 msgstr ""
-"pôvodný nepreložený anglický text\n"
-"je od Olivera Raucha\n"
-"Email: Oliver.Rauch@rauch-domain.de\n"
+"preklad do Slovenského jazyka:\n"
+"Zdenko Podobný\n"
+"Email: zdenop@gmail.com\n"
 
 #. TEXT_INFO_BOX
 msgid "0x0: 0KB"
@@ -807,7 +782,6 @@ msgid "Scanned pages: "
 msgstr "Skenované stránky: "
 
 #. TEXT_EMAIL_TEXT
-#, fuzzy
 msgid "E-mail text:"
 msgstr "Text emailu:"
 
@@ -820,32 +794,29 @@ msgid "Project status:"
 msgstr "Stav projektu:"
 
 #. TEXT_EMAIL_FILETYPE
-#, fuzzy
 msgid "E-mail image filetype:"
 msgstr "Súborový typ obrázka e-mailu:"
 
 #. TEXT_PAGES
-#, fuzzy
 msgid "Pages:"
-msgstr "Použitie:"
+msgstr "Strany:"
 
 #. TEXT_MULTIPAGE_FILETYPE
-#, fuzzy
 msgid "Multipage document filetype:"
-msgstr "Súborový typ obrázka e-mailu:"
+msgstr "Súborový typ viacstranového dokumentu:"
 
 #. TEXT_MEDIUM_DEFINITION_NAME
 msgid "Medium Name:"
 msgstr "Názov média:"
 
 #. TEXT_VIEWER_IMAGE_INFO
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Size %d x %d pixel, %d bits/channel, %d channels, %1.0f dpi x %1.0f dpi, %"
 "1.1f %s"
 msgstr ""
-"Veľkosť v bodoch: %d × %d, bitov/farbu: %d, farieb: %d, %1.0f dpi × %1.0f "
-"dpi, %1.1f %s"
+"Veľkosť: %d × %d bodov, %d bitov/kanál, %d kanálov, %1.0f dpi × %1.0f dpi, %"
+"1.1f %s"
 
 #. TEXT_DESPECKLE_RADIUS
 msgid "Despeckle radius:"
@@ -904,71 +875,77 @@ msgstr "Príkaz:"
 msgid "Copy number option:"
 msgstr "Voľba počtu kópií:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+msgid "Scan resolution:"
+msgstr "Nastavenie rozlíšenia skenovania"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+msgid "lineart [dpi]"
 msgstr "Rozlíšenie čiarovej grafiky (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+msgid "grayscale [dpi]"
 msgstr "Rozlíšenie v odtieňoch šedej (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Farebné rozlíšenie (dpi):"
+msgid "color [dpi]"
+msgstr "farba [dpi]"
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr "Geometria papiera"
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
-msgstr "Šírka"
+msgid "width"
+msgstr "šírka"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
-msgstr "Výška"
+msgid "height"
+msgstr "výška"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+msgid "left offset"
 msgstr "Posun zľava"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+msgid "bottom offset"
 msgstr "Posun zdola"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+msgid "Printer gamma:"
+msgstr "Gama tlačiarne:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Gama hodnota tlačiarne:"
+msgid "common value"
+msgstr "bežná hodnota:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Červená gama tlačiarne:"
+msgid "red"
+msgstr "červená"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Zelená gama tlačiarne:"
+msgid "green"
+msgstr "zelená"
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Modrá gama tlačiarne:"
+msgid "blue"
+msgstr "modrá"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
-#, fuzzy
 msgid "Embed scanner ICM profile as CSA"
-msgstr "Zmazať tlačiareň"
+msgstr "Vložiť ICM profil skenera ako CSA"
 
 #. TEXT_SETUP_PRINTER_EMBED_CRD
-#, fuzzy
 msgid "Embed printer ICM profile as CRD"
-msgstr "Zmazať tlačiareň"
+msgstr "Vložiť ICM profil tlačiarne ako CRD"
 
 #. TEXT_SETUP_PRINTER_CMS_BPC
 msgid "Apply black point compensation"
-msgstr ""
+msgstr "Použiť kompenzáciu čierneho bodu"
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
-msgstr ""
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
+msgstr "Vytvoriť zlib komprimovaný postscript obrázok (PS level 3) pre tlač"
 
 #. TEXT_SETUP_TMP_PATH
 msgid "Temporary directory"
@@ -995,9 +972,8 @@ msgid "Filename counter length"
 msgstr "Dĺžka počítadla názvov súborov"
 
 #. TEXT_SETUP_TIFF_ZIP_COMPRESSION
-#, fuzzy
 msgid "TIFF zip compression rate"
-msgstr "Kompresia 8 bitového TIFF obrázka"
+msgstr "Úroveň zip kompresie TIFF"
 
 #. TEXT_SETUP_TIFF_COMPRESSION_16
 msgid "TIFF 16 bit image compression"
@@ -1091,9 +1067,25 @@ msgstr "Štandardné nastavenia programu pre:"
 msgid "Viewer (Postscript):"
 msgstr "Prehliadač (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Šírka"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Výška"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Posun zľava"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Posun zdola"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
-msgstr ""
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
+msgstr "Vytvoriť zlib komprimovaný postscript obrázok (PS level 3) pre fax"
 
 #. TEXT_SETUP_SMTP_SERVER
 msgid "SMTP server:"
@@ -1112,19 +1104,16 @@ msgid "Reply to:"
 msgstr "Odpovedať na:"
 
 #. TEXT_SETUP_EMAIL_AUTHENTICATION
-#, fuzzy
 msgid "E-mail authentication"
-msgstr "POP3 autentifikácia"
+msgstr "Autentifikácia e-mail:"
 
 #. TEXT_SETUP_EMAIL_AUTH_USER
-#, fuzzy
 msgid "User:"
-msgstr "Použitie:"
+msgstr "Používateľ:"
 
 #. TEXT_SETUP_EMAIL_AUTH_PASS
-#, fuzzy
 msgid "Password:"
-msgstr "Heslo :"
+msgstr "Heslo:"
 
 #. TEXT_SETUP_POP3_SERVER
 msgid "POP3 server:"
@@ -1172,37 +1161,33 @@ msgstr "všetko"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_COLOR_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_COLOR_ICM_PROFILE
-#, fuzzy
 msgid "Scanner default color ICM-profile"
-msgstr "Zmazať tlačiareň"
+msgstr "Štandardný farebný ICM profil skenera"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_GRAY_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_GRAY_ICM_PROFILE
-#, fuzzy
 msgid "Scanner default gray ICM-profile"
-msgstr "Zmazať tlačiareň"
+msgstr "Štandardný šedý ICM profil skenera"
 
 #. TEXT_SETUP_DISPLAY_ICM_PROFILE
 #. DESC_DISPLAY_ICM_PROFILE
 msgid "Display ICM-profile"
-msgstr ""
+msgstr "ICM-profil obrazovky"
 
 #. TEXT_SETUP_CUSTOM_PROOFING_ICM_PROFILE
 #. DESC_CUSTOM_PROOFING_ICM_PROFILE
-#, fuzzy
 msgid "Custom proofing ICM-profile"
-msgstr "Zmazať tlačiareň"
+msgstr ""
 
 #. TEXT_SETUP_WORKING_COLOR_SPACE_ICM_PROFILE
 #. DESC_WORKING_COLOR_SPACE_ICM_PROFILE
-#, fuzzy
 msgid "Working color space ICM-profile"
-msgstr "Vyhľadať názov súboru"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_ICM_PROFILE
 #. DESC_PRINTER_ICM_PROFILE
 msgid "Printer ICM-profile"
-msgstr ""
+msgstr "ICM-profil tlačiarne"
 
 msgid "new media"
 msgstr "nové médium"
@@ -1213,9 +1198,8 @@ msgid "Save"
 msgstr "Ukladanie"
 
 #. NOTEBOOK_FILETYPE_OPTIONS
-#, fuzzy
 msgid "Filetype"
-msgstr "Súbor"
+msgstr "Typ súboru"
 
 #. NOTEBOOK_COPY_OPTIONS
 #. MENU_ITEM_COPY
@@ -1229,9 +1213,8 @@ msgstr "Fax"
 
 #. NOTEBOOK_EMAIL_OPTIONS
 #. MENU_ITEM_EMAIL
-#, fuzzy
 msgid "E-mail"
-msgstr "Email"
+msgstr "E-mail"
 
 #. NOTEBOOK_OCR_OPTIONS
 msgid "OCR"
@@ -1247,7 +1230,7 @@ msgstr "Vylepšenie"
 
 #. MENU_ITEM_MULTIPAGE
 msgid "Multipage"
-msgstr ""
+msgstr "Viacstranový"
 
 #. MENU_ITEM_SHOW_TOOLTIPS
 msgid "Show tooltips"
@@ -1323,9 +1306,8 @@ msgstr "Otočenie postscriptu"
 
 #. MENU_ITEM_ENABLE_COLOR_MANAGEMENT
 #. MENU_ITEM_CMS_ENABLE_COLOR_MANAGEMENT
-#, fuzzy
 msgid "Enable color management"
-msgstr "Celofarebný rozsah"
+msgstr "Povoliť správu farieb"
 
 #  MENU_ITEM_EDIT_MEDIUM_DEF
 #. MENU_ITEM_EDIT_MEDIUM_DEF
@@ -1373,32 +1355,28 @@ msgid "Problems?"
 msgstr "Problémy?"
 
 #. MENU_ITEM_CMS_PROOFING
-#, fuzzy
 msgid "Proofing"
-msgstr "Pridaj tlačiareň"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_PROOF_OFF
 msgid "no proofing (Display)"
 msgstr ""
 
 #. SUBMENU_ITEM_CMS_PROOF_PRINTER
-#, fuzzy
 msgid "Proof printer"
-msgstr "Pridaj tlačiareň"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_PROOF_CUSTOM
 msgid "Proof custom device"
 msgstr ""
 
 #. MENU_ITEM_CMS_RENDERING_INTENT
-#, fuzzy
 msgid "Rendering intent"
-msgstr "Pridaj tlačiareň"
+msgstr ""
 
 #. MENU_ITEM_CMS_PROOFING_INTENT
-#, fuzzy
 msgid "Proofing rendering intent"
-msgstr "Pridaj tlačiareň"
+msgstr ""
 
 #. SUBMENU_ITEM_CMS_INTENT_PERCEPTUAL
 msgid "Perceptual"
@@ -1406,51 +1384,47 @@ msgstr ""
 
 #. SUBMENU_ITEM_CMS_INTENT_RELATIVE_COLORIMETRIC
 msgid "Relative colorimetric"
-msgstr ""
+msgstr "Relatívna kolometria"
 
 #. SUBMENU_ITEM_CMS_INTENT_ABSOLUTE_COLORIMETRIC
 msgid "Absolute colorimentric"
-msgstr ""
+msgstr "Absolútna kolometria"
 
 #. SUBMENU_ITEM_CMS_INTENT_SATURATION
-#, fuzzy
 msgid "Saturation"
-msgstr "autorizácia"
+msgstr "Sýtosť"
 
 #. MENU_ITEM_CMS_GAMUT_CHECK
 msgid "Gamut check"
-msgstr ""
+msgstr "Kontrola gamutu"
 
 #. MENU_ITEM_CMS_GAMUT_ALARM_COLOR
 msgid "Gamut alarm color"
-msgstr ""
+msgstr "Gamut alarm"
 
 #. SUBMENU_ITEM_CMS_COLOR_BLACK
 msgid "Black"
-msgstr ""
+msgstr "Čierna"
 
 #. SUBMENU_ITEM_CMS_COLOR_GRAY
 msgid "Gray"
-msgstr ""
+msgstr "Šedá"
 
 #. SUBMENU_ITEM_CMS_COLOR_WHITE
-#, fuzzy
 msgid "White"
-msgstr "zápis"
+msgstr "Biela"
 
 #. SUBMENU_ITEM_CMS_COLOR_RED
-#, fuzzy
 msgid "Red"
-msgstr "Redukovať"
+msgstr "Červená"
 
 #. SUBMENU_ITEM_CMS_COLOR_GREEN
 msgid "Green"
-msgstr ""
+msgstr "Zelená"
 
 #. SUBMENU_ITEM_CMS_COLOR_BLUE
-#, fuzzy
 msgid "Blue"
-msgstr "Rozostriť"
+msgstr "Modrá"
 
 #. MENU_ITEM_COUNTER_LEN_INACTIVE
 msgid "inactive"
@@ -1465,11 +1439,11 @@ msgid "CCITT 1D Huffman compression"
 msgstr "CCITT 1D Huffmanova kompresia"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+msgid "CCITT Group 3 fax compression"
 msgstr "Kompresia CCITT Group 3 Fax"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+msgid "CCITT Group 4 fax compression"
 msgstr "Kompresia CCITT Group 4 Fax"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1481,9 +1455,8 @@ msgid "pack bits"
 msgstr "bitová kompresia"
 
 #. MENU_ITEM_TIFF_COMP_DEFLATE
-#, fuzzy
 msgid "deflate"
-msgstr "omeškaná"
+msgstr "deflate"
 
 #. MENU_ITEM_RANGE_SCALE
 msgid "Slider (Scale)"
@@ -1551,13 +1524,12 @@ msgid "Move item down"
 msgstr "Posunúť položku dole"
 
 #. MENU_ITEM_AUTH_NONE
-#, fuzzy
 msgid "no authentication"
-msgstr "POP3 autentifikácia"
+msgstr "bez autentifikácie"
 
 #. MENU_ITEM_AUTH_POP3
 msgid "POP3 before SMTP"
-msgstr ""
+msgstr "POP3 pred SMTP"
 
 #. MENU_ITEM_AUTH_ASMTP_PLAIN
 msgid "ASMTP Plain"
@@ -1572,18 +1544,16 @@ msgid "ASMTP CRAM-MD5"
 msgstr ""
 
 #. MENU_ITEM_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE
-#, fuzzy
 msgid "Embed scanner ICM profile"
-msgstr "Zmazať tlačiareň"
+msgstr "Vložiť ICM profil skenera"
 
 #. MENU_ITEM_CMS_FUNCTION_CONVERT_TO_SRGB
 msgid "Convert to sRGB"
-msgstr ""
+msgstr "Konvertovať do sRGB"
 
 #. MENU_ITEM_FUNCTION_CONVERT_TO_WORKING_CS
-#, fuzzy
 msgid "Convert to working color space"
-msgstr "Automatická korekcia farieb"
+msgstr ""
 
 #. PROGRESS_SCANNING
 msgid "Scanning"
@@ -1595,12 +1565,11 @@ msgid "Receiving %s data"
 msgstr "Prijímanie %s dát"
 
 #. PROGRESS_PAGE
-#, fuzzy
 msgid "page"
-msgstr "balík"
+msgstr "strana"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+msgid "Transferring image"
 msgstr "Prenášanie obrázka"
 
 #. PROGRESS_ROTATING_DATA
@@ -1644,9 +1613,8 @@ msgid "OCR in progress"
 msgstr "Vykonáva sa OCR"
 
 #. PROGRESS_ICM_CONVERSION
-#, fuzzy
 msgid "converting colors"
-msgstr "Automatická korekcia farieb"
+msgstr "konvertovanie farieb"
 
 #. DESC_SCAN_START
 msgid "Start scan <Ctrl-Enter>"
@@ -1665,18 +1633,17 @@ msgid "Cancel preview scan <Alt-ESC>"
 msgstr "Prerušenie skenovanie náhľadu <Alt-ESC>"
 
 #. DESC_XSANE_MODE
-#, fuzzy
 msgid ""
 "viewer-<Ctrl-v>, save-<Ctrl-s>, photocopy-<Ctrl-c>, multipage-<Ctrl-m>, fax-"
 "<Ctrl-f> or e-mail-<Ctrl-e>"
 msgstr ""
-"uložiť<Ctrl-s>, zobraziť-<Ctrl-v>, fotokópia-<Ctrl-c>, fax-<Ctrl-f> alebo "
-"pošta-<Ctrl-m>"
+"zobraziť-<Ctrl-v>, uložiť<Ctrl-s>,  fotokópia-<Ctrl-c>, <viacstranový-<Ctrl-"
+"m>, fax-<Ctrl-f> alebo e-mail-<Ctrl-e>"
 
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -1707,9 +1674,8 @@ msgstr ""
 "Typ formátu obrázku; vhodná koncovka je automaticky pridaná k názvu súboru."
 
 #. DESC_FAXPROJECT
-#, fuzzy
 msgid "Enter fax project directory name"
-msgstr "Vyhľadať pomocný priečinok"
+msgstr "Vložte názov priečinka faxového projektu"
 
 #. DESC_FAXPAGENAME
 msgid "Enter new name for faxpage"
@@ -1720,53 +1686,44 @@ msgid "Enter receiver phone number or address"
 msgstr "Vložte telefónne číslo alebo adresu príjemcu"
 
 #. DESC_FAX_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for fax project directory"
-msgstr "Vyhľadať pomocný priečinok"
+msgstr "Vyhľadať priečinok faxového projektu"
 
 #. DESC_EMAIL_PROJECT
-#, fuzzy
 msgid "Enter e-mail project directory name"
-msgstr "Vyhľadať pomocný priečinok"
+msgstr "Vložte názov priečinka e-mailového projektu"
 
 #. DESC_EMAIL_IMAGENAME
-#, fuzzy
 msgid "Enter new name for e-mail image"
-msgstr "Vložte nový názov pre poštový obrázok"
+msgstr "Vložte nový názov pre e-mailový obrázok"
 
 #. DESC_EMAIL_RECEIVER
-#, fuzzy
 msgid "Enter e-mail address"
-msgstr "Vložte emailovú adresu"
+msgstr "Vložte e-mailovú adresu"
 
 #. DESC_EMAIL_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for email project directory"
-msgstr "Vyhľadať pomocný priečinok"
+msgstr "Vyhľadať priečinok e-mailového projektu"
 
 #. DESC_EMAIL_SUBJECT
-#, fuzzy
 msgid "Enter subject of e-mail"
-msgstr "Vložte predmet správy"
+msgstr "Vložte predmet e-mailu"
 
 #. DESC_EMAIL_FILETYPE
 msgid "Select filetype for image attachments"
 msgstr "Vyberte si typ súboru pre obrázkové prílohy k e-mailom"
 
 #. DESC_MULTIPAGE_PROJECT
-#, fuzzy
 msgid "Enter multipage project directory name"
-msgstr "Vyhľadať pomocný priečinok"
+msgstr "Vložte názov priečinka viacstranového projektu"
 
 #. DESC_MULTIPAGE_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for multipage project directory"
-msgstr "Vyhľadať pomocný priečinok"
+msgstr "Vyhľadať  priečinok viacstranového projektu"
 
 #. DESC_MULTIPAGE_FILETYPE
-#, fuzzy
 msgid "Select filetype for multipage file"
-msgstr "Vyberte si typ súboru pre obrázkové prílohy k e-mailom"
+msgstr "Vyberte si typ súboru pre viacstranový súbor"
 
 #. DESC_PRESET_AREA_RENAME
 msgid "Enter new name for preset area"
@@ -1892,9 +1849,8 @@ msgstr ""
 
 #  DESC_ENH_AUTO
 #. DESC_ENH_AUTO
-#, fuzzy
 msgid "Autoadjust gamma, brightness and contrast <Ctrl-a>"
-msgstr "Automatické nastavenie gamy, jasu a kontrastu <Ctrl-e>"
+msgstr "Automatické nastavenie gamy, jasu a kontrastu <Ctrl-a>"
 
 #  DESC_ENH_DEFAULT
 #. DESC_ENH_DEFAULT
@@ -2016,21 +1972,23 @@ msgstr "Dodatočná gama hodnota pre modrý komponent fotokópie"
 
 #. DESC_PRINTER_EMBED_CSA
 msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-msgstr ""
+msgstr "Vytvoriť postscript súbor obsahujúci ICM profil skenera"
 
 #. DESC_PRINTER_EMBED_CRD
 msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-msgstr ""
+msgstr "Vytvoriť postscript súbor obsahujúci ICM profil tlačiarne"
 
 #. DESC_PRINTER_CMS_BPC
 msgid "Applies black point compensation"
-msgstr ""
+msgstr "Používa kompenzáciu čierneho bodu"
 
 #. DESC_PRINTER_PS_FLATEDECODED
 msgid ""
 "Create zlib compressed postscript image for printer (flatedecode).\n"
 "The printer has to understand postscript level 3!"
 msgstr ""
+"Vytvoriť zlib komprimovaný postskript obrázok pre tlačiareň (flatedecode).\n"
+"Tlačiareň musí podporovať postscript level 3!"
 
 #. DESC_TMP_PATH
 msgid "Path to temp directory"
@@ -2042,13 +2000,13 @@ msgstr "Vyhľadať pomocný priečinok"
 
 #. DESC_JPEG_QUALITY
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Kvalita v percentách, ak obrázok je uložený ako jpeg alebo tiff s jpeg "
 "kompresiou"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+msgid "Compression if image is saved as PNG"
 msgstr "Kompresia, ak obrázok je uložený ako png"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2056,21 +2014,20 @@ msgid "Minimum length of counter in filename"
 msgstr "Minimálna dĺžka počítadla názvov súborov"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-#, fuzzy
-msgid "Compression rate for zip compressed tiff (deflate)"
-msgstr "Typ kompresie, ak obrázok je uložený ako 8 bitový TIFF"
+msgid "Compression rate for zip compressed TIFF (deflate)"
+msgstr "Úroveň kompresie pre zip komprimované TIFF (deflate)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
-msgstr "Typ kompresie, ak obrázok je uložený ako 16 bitový TIFF"
+msgid "Compression type if 16 bit image is saved as TIFF"
+msgstr "Typ kompresie, ak 16 bitový obrázok je uložený ako  TIFF"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
-msgstr "Typ kompresie, ak obrázok je uložený ako 8 bitový TIFF"
+msgid "Compression type if 8 bit image is saved as TIFF"
+msgstr "Typ kompresie, ak 8 bitový obrázok je uložený ako  TIFF"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
-msgstr "Typ kompresie, ak je obrázok uložený ako TIFF čiarová grafika"
+msgid "Compression type if lineart image is saved as TIFF"
+msgstr "Typ kompresie, ak je obrázok čiarovej grafiky uložený ako TIFF "
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device dependant preferences in default file at exit of xsane"
@@ -2093,29 +2050,30 @@ msgid ""
 "compress postscript image with zlib algorithm (flatedecode). When you want "
 "to print such a file your printer has to understand postscript level 3"
 msgstr ""
+"komprimovať postscript obrázok so zlib algoritmom (flatedecode). Aby ste "
+"takýto obrázok mohli vytlačiť, tlačiareň musí podporovať  postscript level 3"
 
 #. DESC_SAVE_PDF_FLATEDECODED
 msgid "compress PDF image with zlib algorithm (flatedecode)."
-msgstr ""
+msgstr "komprimovať PDF obrázky so zlib algoritmom  (flatedecode)."
 
 #. DESC_SAVE_PNM16_AS_ASCII
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
-"Keď ukladáte 16 bitový obrázok vo formáte pnm, tak by ste mali použiť ascii  "
+"Keď ukladáte 16 bitový obrázok vo formáte pnm, tak by ste mali použiť ASCII "
 "formát namiesto binárneho formátu. Binárny formát je novým formátom a nie je "
-"podporovaný všetkými programami. Ascii formát je podporovaný oveľa väčším "
+"podporovaný všetkými programami. ASCII formát je podporovaný oveľa väčším "
 "počtom programov, ale vytvára skutočne veľké súbory!!!"
 
 #. DESC_REDUCE_16BIT_TO_8BIT
-#, fuzzy
 msgid ""
 "If scanner sends image with 16 bits/channel save image with 8 bits/channel"
 msgstr ""
-"Ak skener pošle farebný 16 bitový obrázok, zapísať obrázok v bitoch/farbu"
+"Ak skener pošle farebný 16 bitový obrázok, uložiť obrázok v 8 bitoch/kanál"
 
 #. DESC_PSFILE_WIDTH
 msgid "Width of paper for postscript files"
@@ -2146,7 +2104,6 @@ msgstr ""
 "veľkosťou"
 
 #. DESC_DISABLE_GIMP_PREVIEW_GAMMA
-#, fuzzy
 msgid "Disable preview gamma when XSane runs as GIMP plugin"
 msgstr "Zakázať gama náhľad, keď je XSane spustené ako GIMP modul"
 
@@ -2159,7 +2116,7 @@ msgid "Select how a range is displayed"
 msgstr "Zvoliť ako sa zobrazí rozsah"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Hodnota, ktorou sa násobí rozlíšenie náhľadu"
 
 #. DESC_PREVIEW_GAMMA
@@ -2216,7 +2173,7 @@ msgstr "Posun, ktorý nastaví rovnaký rozsah prahu XSane a rozsah prahu skener
 
 #. DESC_ADF_PAGES_MAX
 msgid "Number of pages to scan"
-msgstr ""
+msgstr "Počet strán na skenovanie"
 
 #. DESC_PREVIEW_PIPETTE_RANGE
 msgid "dimension of square that is used to average color for pipette function"
@@ -2225,17 +2182,16 @@ msgstr ""
 
 #. DESC_DOC_VIEWER
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
-"Nastavenie príkazu k zobrazeniu súborov pomocníka - musí to byť html "
-"prehliadač!"
+"Vložiť príkaz k zobrazeniu súborov pomocníka - musí to byť html prehliadač!"
 
 #. DESC_AUTOENHANCE_GAMMA
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Zmení gama hodnotu, ak je stlačené tlačidlo automatickej úpravy"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+msgid "Select scan area after preview scan has finished"
 msgstr "Nastavenie skenovanej oblasti po dokončení náhľadu"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2243,13 +2199,12 @@ msgid "Do color correction after preview scan has finished"
 msgstr "Vykonanie farebnej korekcie po dokončení náhľadu"
 
 #. DESC_RENDERING_INTENT
-#, fuzzy
 msgid "Select rendering intent for preview and saving"
-msgstr "Nastavenie skenovanej oblasti po dokončení náhľadu"
+msgstr ""
 
 #. DESC_CMS_BPC
 msgid "Apply black point compensation when color transformation is done"
-msgstr ""
+msgstr "Použiť kompenzáciu čierneho bodu po ukončení farebnej transformácie"
 
 #. DESC_FAX_COMMAND
 msgid "Enter command to be executed in fax mode"
@@ -2281,7 +2236,7 @@ msgstr "Poslať fax s vysokým zvislým rozlíšením (196 lpi  namiesto 98 lpi)
 
 #. DESC_FAX_PS_FLATEDECODED
 msgid "Create zlib compressed postscript image for fax (flatedecode)"
-msgstr ""
+msgstr "Vytvoriť zlib komprimovaný postscript obrázok pre fax (flatedecode)"
 
 #. DESC_SMTP_SERVER
 msgid "IP Address or Domain name of SMTP server"
@@ -2292,29 +2247,24 @@ msgid "port to connect to SMTP server"
 msgstr "port na pripojenie sa k SMTP"
 
 #. DESC_EMAIL_FROM
-#, fuzzy
 msgid "enter your e-mail address"
-msgstr "vložte svoju emailovú adresu"
+msgstr "vložte svoju e-mailovú adresu"
 
 #. DESC_EMAIL_REPLY_TO
-#, fuzzy
 msgid "enter e-mail address for replied e-mails"
-msgstr "vložte svoju emailovú adresu pre odpoveď"
+msgstr "vložte svoju e-mailovú adresu pre odpoveď"
 
 #. DESC_EMAIL_AUTHENTICATION
-#, fuzzy
 msgid "Type of authentication before sending e-mail"
-msgstr "Autentifikácia na POP3 servery pre odoslaním emailu"
+msgstr "Typ autentifikácie pred odoslaním e-mailu"
 
 #. DESC_EMAIL_AUTH_USER
-#, fuzzy
 msgid "user name for e-mail server"
-msgstr "používateľské meno pre POP3 server"
+msgstr "používateľské meno pre e-mailový server"
 
 #. DESC_EMAIL_AUTH_PASS
-#, fuzzy
 msgid "password for e-mail server"
-msgstr "heslo pre POP3 server"
+msgstr "heslo pre e-mailový server"
 
 #. DESC_POP3_SERVER
 msgid "IP Address or Domain name of POP3 server"
@@ -2325,31 +2275,30 @@ msgid "port to connect to POP3 server"
 msgstr "port na pripojenie sa k POP3 serveru"
 
 #. DESC_HTML_EMAIL
-#, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
-msgstr "E-mail je poslaný v html režime, umiestnite obrázok pomocou: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
+msgstr "E-mail je poslaný v HTML režime, obrázok umiestnite pomocou: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
-msgstr "Nastavenie príkazu na spustenie ocr programu"
+msgid "Enter command to start OCR program"
+msgstr "Vložte príkaz na spustenie OCR programu"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
-msgstr "Zadajte voľbu pre ocr program na definovanie vstupného súboru"
+msgid "Enter option of the OCR program to define input file"
+msgstr "Zadajte voľbu pre OCR program na definovanie vstupného súboru"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
-msgstr "Zadajte voľbu pre ocr program na definovanie výstupného súboru"
+msgid "Enter option of the OCR program to define output file"
+msgstr "Zadajte voľbu pre OCR program na definovanie výstupného súboru"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
-msgstr "Určenie, či ocr program podporuje gui rúru postupu"
+msgid "Define if the OCR program supports gui progress pipe"
+msgstr "Určenie, či OCR program podporuje gui rúru postupu"
 
 #. DESC_OCR_OUTFD_OPT
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
-"Vložiť nastavenie ocr programu určujúci výstupný popis súboru v GUI režime"
+"Vložiť nastavenie OCR programu určujúci výstupný popis súboru v GUI režime"
 
 #. DESC_OCR_PROGRESS_KEYWORD
 msgid "Define Keyword that is used to mark progress information"
@@ -2365,9 +2314,8 @@ msgid "write"
 msgstr "zápis"
 
 #. DESC_PERMISSION_SEARCH
-#, fuzzy
 msgid "search"
-msgstr "používateľ"
+msgstr "hľadať"
 
 #. DESC_ADD_BATCH
 msgid "Add selection for batch scan"
@@ -2386,7 +2334,7 @@ msgid "Pick black point"
 msgstr "Výber čierneho bodu"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+msgid "Use full scan area"
 msgstr "Použiť celú skenovaciu oblasť"
 
 #  DESC_ZOOM_OUT
@@ -2411,12 +2359,12 @@ msgstr "Vrátiť späť poslednú zmenu"
 msgid "Select visible area"
 msgstr "Vybrať viditeľnú oblasť"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+msgid "Autoselect scan area"
 msgstr "Automatický výber skenovanej oblasti"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+msgid "Autoraise scan area"
 msgstr "Automatické zvýšenie skenovanej oblasti"
 
 #. DESC_DELETE_IMAGES
@@ -2426,7 +2374,7 @@ msgstr "Zmazať pamäť náhľadu"
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Predvolená oblasť:\n"
@@ -2458,16 +2406,16 @@ msgid "Clone image"
 msgstr "Duplikovanie obrázka"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
-msgstr "Otočenie obrázka o 90 stupňov"
+msgid "Rotate image 90 degrees"
+msgstr "Otočiť obrázok o 90 stupňov"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
-msgstr "Otočenie obrázka o 180 stupňov"
+msgid "Rotate image 180 degrees"
+msgstr "Otočiť obrázok o 180 stupňov"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
-msgstr "Otočenie obrázka o 270 stupňov"
+msgid "Rotate image 270 degrees"
+msgstr "Otočiť obrázok o 270 stupňov"
 
 #. DESC_MIRROR_X
 msgid "Mirror image at vertical axis"
@@ -2503,12 +2451,12 @@ msgstr "Faktor zmeny veľkosti Y"
 
 #  DESC_SCALE_WIDTH
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
-msgstr "Zmeniť zväčšenie na šírky [v bodoch]"
+msgid "Scale image to width [pixels]"
+msgstr "Zmeniť zväčšenie na šírku [v bodoch]"
 
 #  DESC_SCALE_HEIGHT
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+msgid "Scale image to height [pixels]"
 msgstr "Zmeniť zväčšenie na výšku [v bodoch]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2541,34 +2489,28 @@ msgid "Turns on automatic mode"
 msgstr "Zapne automatický režim"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_COLOR_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for scanner default color ICM-profile"
-msgstr "Vyhľadať názov súboru"
+msgstr "Vyhľadať štandardný farebný ICM-profil skenera"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_GRAY_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for scanner default gray ICM-profile"
-msgstr "Vyhľadať názov súboru"
+msgstr "Vyhľadať štandardný šedý ICM-profil skenera"
 
 #. DESC_BUTTON_DISPLAY_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for display ICM-profile"
-msgstr "Vyhľadať názov súboru"
+msgstr "Vyhľadať ICM-profil displeja"
 
 #. DESC_BUTTON_PRINTER_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for printer ICM-profile"
-msgstr "Vyhľadať názov súboru"
+msgstr "Vyhľadať ICM-profil tlačiarne"
 
 #. DESC_BUTTON_CUSTOM_PROOFING_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for custom proofing ICM-profile"
-msgstr "Vyhľadať názov súboru"
+msgstr ""
 
 #. DESC_BUTTON_WORKING_COLOR_SPACE_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for working color space ICM-profile"
-msgstr "Vyhľadať názov súboru"
+msgstr "Vyhľadať ICM-profil pracovného farebného priestoru"
 
 #. ERR_HOME_DIR
 msgid "Failed to determine home directory:"
@@ -2583,12 +2525,17 @@ msgid "Filename too long"
 msgstr "Názov súboru príliš dlhý"
 
 #. ERR_CREATE_TEMP_FILE
+#, fuzzy
 msgid ""
 "Could not create temporary file.\n"
 "Open Menue Preferences->Setup Tab Save and\n"
 "select a temporary directory where you have\n"
 "write permissions."
 msgstr ""
+"Nie je možné vytvoriť dočasný súbor.\n"
+"Otvorte ponuku Nastavenia->Karta nastavenie Ukladania\n"
+"a vyberte dočasný priečinok, do ktorého máte prístup\n"
+"na zapisovanie."
 
 #. ERR_SET_OPTION
 msgid "Failed to set value of option"
@@ -2631,7 +2578,7 @@ msgid "Failed to open"
 msgstr "Zlyhalo otváranie"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Nie je možné vytvoriť bezpečný súbor (možno, že existuje odkaz):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2708,8 +2655,8 @@ msgid "Failed to execute fax command:"
 msgstr "Zlyhalo spustenie faxového príkazu:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Zlyhalo spustenie ocr príkazu:"
+msgid "Failed to execute OCR command:"
+msgstr "Nepodarilo sa spustiť OCR príkaz:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2773,7 +2720,7 @@ msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Spúšťate XSane ako ROOT, čo je veľmi nebezpečné!\n"
@@ -2856,34 +2803,28 @@ msgid "Unsupported %d-bit output format: %s"
 msgstr "Nepodporovaný %d-bitový výstupný formát: %s"
 
 #. ERR_CMS_CONVERSION
-#, fuzzy
 msgid "Error during CMS conversion:"
-msgstr "Chyba počas ukladania:"
+msgstr "Chyba počas CMS konverzií:"
 
 #. ERR_CMS_OPEN_ICM_FILE
-#, fuzzy
 msgid "Could not open"
-msgstr "Zlyhalo otváranie"
+msgstr "Nie je možné otvoriť"
 
 #. CMS_SCANNER_ICM
-#, fuzzy
 msgid "scanner ICM profile"
-msgstr "Zmazať tlačiareň"
+msgstr "ICM profile skenera"
 
 #. CMS_DISPLAY_ICM
-#, fuzzy
 msgid "display ICM profile"
-msgstr "Vyhľadať názov súboru"
+msgstr "ICM profile displeja"
 
 #. CMS_PROOF_ICM
-#, fuzzy
 msgid "proofing ICM profile"
-msgstr "Zmazať tlačiareň"
+msgstr ""
 
 #. ERR_CMS_CREATE_TRANSFORM
-#, fuzzy
 msgid "Could not create transform"
-msgstr "Nie je možné vytvoriť dočasný súbor"
+msgstr "Nie je možné vytvoriť transformáciu"
 
 #. WARN_VIEWER_IMAGE_NOT_SAVED
 msgid "viewer image is not saved"
@@ -2891,31 +2832,27 @@ msgstr "obrázok z prehliadača nie je uložený"
 
 #. FILE_FILTER_ALL_FILES
 msgid "All files"
-msgstr ""
+msgstr "Všetky súbory"
 
 #. FILE_FILTER_IMAGES
-#, fuzzy
 msgid "Images"
-msgstr "Obrázok"
+msgstr "Obrázky"
 
 #. FILE_FILTER_XBL
-#, fuzzy
 msgid "XSane batch list"
-msgstr "Uložiť dávkový zoznam"
+msgstr "XSane dávkový zoznam"
 
 #. FILE_FILTER_ICM
 msgid "ICC/ICM Profiles"
-msgstr ""
+msgstr "ICC/ICM profily"
 
 #. FILE_FILTER_DRC
-#, fuzzy
 msgid "XSane device preferences"
-msgstr "Uložiť nastavenie zariadenia pri ukončení"
+msgstr "XSane nastavenia zariadení"
 
 #. FILE_FILTER_RC
-#, fuzzy
 msgid "XSane preferences"
-msgstr "Nastavenia"
+msgstr "XSane Nastavenia"
 
 #. TEXT_USAGE
 msgid "Usage:"
@@ -2927,7 +2864,6 @@ msgstr "[VOĽBA]... [ZARIADENIE]"
 
 #  TEXT_HELP
 #. TEXT_HELP
-#, fuzzy
 msgid ""
 "Start up graphical user interface to access SANE (Scanner Access Now Easy) "
 "devices.\n"
@@ -2965,7 +2901,7 @@ msgid ""
 msgstr ""
 "Spustenie grafického rozhrania pre prístup k SANE zariadeniam.\n"
 "\n"
-"Formát [ZARIADENIA] je názov_ovládača:názov zariadenia (napr. umax:/dev/"
+"Formát [ZARIADENIA] je názov_ovládača:názov_zariadenia (napr. umax:/dev/"
 "scanner).\n"
 "[VOĽBA]... môže mať kombináciu nasledovných položiek:\n"
 " -h, --help                  zobrazí tohoto pomocníka a skončí\n"
@@ -2978,8 +2914,9 @@ msgstr ""
 " -V, --viewer                spustí v režime prehliadač (štandardné)\n"
 " -s, --save                  spustí v režime ukladania\n"
 " -c, --copy                  spustí v režime kopírovania\n"
-" -f, --fax                   spustí v režime faxovania\n"
-" -m, --mail                  spustí v režime emailu\n"
+" -m, --multipage              spustí s aktívnym viacstranovým režimom\n"
+" -f, --fax                   spustí s aktívnym režimom faxovania\n"
+" -m, --mail                  spustí s aktívnym režimom e-mailu\n"
 " -n, --no-mode-selection     zakáže ponuku výberu režimu XSane\n"
 "\n"
 " -F, --Fixed                 použije pevnú veľkosť hlavného okna (prepíše\n"
@@ -3034,7 +2971,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Možné dôvody:\n"
@@ -3161,44 +3098,36 @@ msgid "Rossmann negative HR 100"
 msgstr "Rossmann negatív HR 100"
 
 #. TEXT_PROJECT_STATUS_NOT_CREATED
-#, fuzzy
 msgid "Project not created"
-msgstr "Faxový projekt nebol vytvorený"
+msgstr "Projekt nebol vytvorený"
 
 #. TEXT_PROJECT_STATUS_CREATED
-#, fuzzy
 msgid "Project created"
-msgstr "Faxový projekt vytvorený"
+msgstr "Projekt vytvorený"
 
 #. TEXT_PROJECT_STATUS_CHANGED
-#, fuzzy
 msgid "Project changed"
-msgstr "Faxový projekt zmenený"
+msgstr "Projekt zmenený"
 
 #. TEXT_PROJECT_STATUS_ERR_READ_PROJECT
-#, fuzzy
 msgid "Error reading project"
-msgstr "Chyba pri čítaní e-mailového projektu"
+msgstr "Chyba pri čítaní projektu"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING_ERROR
-#, fuzzy
 msgid "Error saving file"
-msgstr "Ukladanie obrázka"
+msgstr "Chyba pri ukladaní obrázka"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING
-#, fuzzy
 msgid "Saving file"
-msgstr "Ukladanie obrázka"
+msgstr "Ukladanie súboru"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING_ABORTED
-#, fuzzy
 msgid "Aborted saving file"
-msgstr "Ukladanie obrázka"
+msgstr "Prerušené ukladanie súboru"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVED
-#, fuzzy
 msgid "File has been saved"
-msgstr "E-mail bol poslaný"
+msgstr "Súbor pol uložený"
 
 #. TEXT_EMAIL_STATUS_POP3_CONNECTION_FAILED
 msgid "POP3 connection failed"
@@ -3209,9 +3138,8 @@ msgid "POP3 login failed"
 msgstr "POP3 prihlásenie zlyhalo"
 
 #. TEXT_EMAIL_STATUS_ASMTP_AUTH_FAILED
-#, fuzzy
 msgid "ASMTP authentication failed"
-msgstr "SMTP pripojenie zlyhalo"
+msgstr "ASMTP autentifikácia zlyhala"
 
 #. TEXT_EMAIL_STATUS_SMTP_CONNECTION_FAILED
 msgid "SMTP connection failed"
@@ -3226,22 +3154,19 @@ msgid "Receiver entry not accepted"
 msgstr "Položka Príjemca je neakceptovaná"
 
 #. TEXT_EMAIL_STATUS_SMTP_ERR_DATA
-#, fuzzy
 msgid "E-mail data not accepted"
 msgstr "E-mailové dáta neakceptované"
 
 #. TEXT_EMAIL_STATUS_SENDING
-#, fuzzy
 msgid "Sending e-mail"
-msgstr "Posielanie e-mailu"
+msgstr "Odosielanie e-mailu"
 
 #. TEXT_EMAIL_STATUS_SENT
-#, fuzzy
 msgid "E-mail has been sent"
-msgstr "E-mail bol poslaný"
+msgstr "E-mail bol odoslaný"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+msgid "Queueing fax"
 msgstr "Zaraďovanie faxu do fronty"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3302,142 +3227,3 @@ msgstr "Mimo pamäte"
 
 msgid "Access to resource has been denied"
 msgstr "Prístup k zdroju bol odmietnutý"
-
-#, fuzzy
-#~ msgid "select scanner transmissive ICM-profile"
-#~ msgstr "Zmazať tlačiareň"
-
-#, fuzzy
-#~ msgid "select scanner transmissive gray ICM-profile"
-#~ msgstr "Zmazať tlačiareň"
-
-#, fuzzy
-#~ msgid "Scanner reflective ICM-profile"
-#~ msgstr "Zmazať tlačiareň"
-
-#, fuzzy
-#~ msgid "Scanner reflective gray ICM-profile"
-#~ msgstr "Zmazať tlačiareň"
-
-#, fuzzy
-#~ msgid "Scanner transmissive gray ICM-profile"
-#~ msgstr "Zmazať tlačiareň"
-
-#, fuzzy
-#~ msgid "Scanner reflektive ICM-profile"
-#~ msgstr "Zmazať tlačiareň"
-
-#, fuzzy
-#~ msgid "Browse for scanner transmissive ICM-profile"
-#~ msgstr "Vyhľadať názov súboru"
-
-#, fuzzy
-#~ msgid "Browse for scanner transmissive gray ICM-profile"
-#~ msgstr "Vyhľadať názov súboru"
-
-#~ msgid "GIMP can't handle depth %d bits/color"
-#~ msgstr "GIMP nemôže spracovať hĺbku %d bitov/farbu"
-
-#, fuzzy
-#~ msgid "scanner reflective ICM profile"
-#~ msgstr "Zmazať tlačiareň"
-
-#, fuzzy
-#~ msgid "Embed scanner/source ICM profile for GIMP"
-#~ msgstr "Zmazať tlačiareň"
-
-#~ msgid "Enter name of fax project"
-#~ msgstr "Vložte názov faxového projektu"
-
-#, fuzzy
-#~ msgid "Enter name of e-mail project"
-#~ msgstr "Vložte názov poštového projektu"
-
-#, fuzzy
-#~ msgid "Enter name of multipage project"
-#~ msgstr "Vložte názov poštového projektu"
-
-#~ msgid ""
-#~ "Gimp does not support depth 16 bits/color.\n"
-#~ "Do you want to reduce the depth to 8 bits/color?"
-#~ msgstr ""
-#~ "GIMP nepodporuje hĺbku 16 bitov/farba.\n"
-#~ "Prajete si redukciu hĺbky na 8 bitov/farba?"
-
-#, fuzzy
-#~ msgid "POP3 authentication"
-#~ msgstr "POP3 autentifikácia"
-
-#~ msgid "XSane mode"
-#~ msgstr "XSane režim"
-
-#~ msgid "POP3 user:"
-#~ msgstr "POP3 používateľ:"
-
-#~ msgid "POP3 password:"
-#~ msgstr "POP3 heslo:"
-
-#~ msgid "Automatic Document Feeder Modus:"
-#~ msgstr "Režim automatického podávača dokumentov:"
-
-#~ msgid ""
-#~ "Select scansource for Automatic Document feeder. If this scansource is "
-#~ "selected XSane scans until \"out of paper\" or error."
-#~ msgstr ""
-#~ "Výber zdroja skenovania pre automatický podávač dokumentov. Pokiaľ je "
-#~ "táto voľba nastavená, XSane skenuje, pokiaľ nenastane stav \"nie je papier"
-#~ "\" alebo chyba"
-
-#, fuzzy
-#~ msgid "E-mail project not created"
-#~ msgstr "E-mailový projekt nebol vytvorený"
-
-#, fuzzy
-#~ msgid "E-mail project created"
-#~ msgstr "E-mailový projekt vytvorený"
-
-#, fuzzy
-#~ msgid "E-mail project changed"
-#~ msgstr "E-mailový projekt zmenený"
-
-#, fuzzy
-#~ msgid "Multipage project not created"
-#~ msgstr "E-mailový projekt nebol vytvorený"
-
-#, fuzzy
-#~ msgid "Multipage project created"
-#~ msgstr "E-mailový projekt vytvorený"
-
-#, fuzzy
-#~ msgid "Multipage project changed"
-#~ msgstr "E-mailový projekt zmenený"
-
-#, fuzzy
-#~ msgid "Error reading multipage project"
-#~ msgstr "Chyba pri čítaní e-mailového projektu"
-
-#, fuzzy
-#~ msgid "Saving multipage file"
-#~ msgstr "Ukladanie obrázka"
-
-#, fuzzy
-#~ msgid "Multipage saving aborted"
-#~ msgstr "E-mailový projekt vytvorený"
-
-#~ msgid "Viewer (png):"
-#~ msgstr "Prehliadač (png):"
-
-#, fuzzy
-#~ msgid "Enter command to be executed to view an e-mail image"
-#~ msgstr ""
-#~ "Nastavenie príkazu, ktorý ma byť spustený k zobrazeniu obrázku v emaily"
-
-#, fuzzy
-#~ msgid "Failed to execute e-mail image viewer:"
-#~ msgstr "Zlyhalo spustenie prehliadača obrázkov e emaily:"
-
-#~ msgid "Step"
-#~ msgstr "Krok"
-
-#~ msgid "Mail"
-#~ msgstr "Pošta"
diff --git a/po/sl.gmo b/po/sl.gmo
index 061902c..7b92862 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
index 4e3f10b..9aa12ff 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xsane\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2006-01-02 17:48+0100\n"
 "Last-Translator: Dušan Vejnovič <dusan@vejnovic.com>\n"
 "Language-Team: slovenščina <sl@li.org>\n"
@@ -87,7 +87,8 @@ msgid "rename fax page"
 msgstr "preimenuj stran s faksom"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "vstavi ps-datoteko v faks"
 
 #. WINDOW_EMAIL_PROJECT
@@ -506,7 +507,8 @@ msgid "Skip existing filenames"
 msgstr "Preskoči obstoječa imena datotek"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+#, fuzzy
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr "Shrani postscript stisnjen z zlib (ps stopnja 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -514,7 +516,8 @@ msgid "Save PDF zlib compressed"
 msgstr "Shrani PDF stisnjen z zlib"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Shrani 16 bitni pnm v ASCII formatu"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -538,8 +541,9 @@ msgstr "Uporabi lastno paleto barv"
 msgid "Autoenhance gamma"
 msgstr "Samodejno izboljšaj faktor gama"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Predizbrano območje skeniranja"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -563,10 +567,6 @@ msgstr "iskanje naprav"
 msgid "Available devices:"
 msgstr "Razpoložljive naprave:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Izbire XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Tip"
@@ -890,53 +890,72 @@ msgstr "Ukaz:"
 msgid "Copy number option:"
 msgstr "Število kopij:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Nastavitev ločljivosti skeniranja"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Črnobela ločljivost (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Sivinska ločljivost (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Barvna ločljivost (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Širina"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Višina"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Levi odmik"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Odmik spodaj"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Gama rdeča za tiskalnik:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Vrednost gama za tiskalnik:"
+#, fuzzy
+msgid "common value"
+msgstr "Zadnje vrednosti"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Gama rdeča za tiskalnik:"
+#, fuzzy
+msgid "red"
+msgstr "preberi"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Gama zelena za tiskalnik:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Gama modra za tiskalnik:"
+#, fuzzy
+msgid "blue"
+msgstr "Zamegli"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -953,7 +972,8 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr "Ustvari stisnjeno postscriptno sliko z zlib (ps stopnja 3) za tiskanje"
 
 #. TEXT_SETUP_TMP_PATH
@@ -1076,8 +1096,25 @@ msgstr "Nastavi privzete nastavitve programa za:"
 msgid "Viewer (Postscript):"
 msgstr "Ogledovalnik (postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Širina"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Višina"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Levi odmik"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Odmik spodaj"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr "Ustvari stisnjeno postscriptno sliko z zlib (ps stopnja 3) za faks"
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1444,11 +1481,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "CCITT 1D Huffmanovo stiskanje"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "CCITT Group 3 stiskanje za fakse"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "CCITT Group 4 stiskanje za fakse"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1574,8 +1613,9 @@ msgstr "Prejemam %s podatke"
 msgid "page"
 msgstr "stran"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Prenašam sliko"
 
 #. PROGRESS_ROTATING_DATA
@@ -1648,9 +1688,10 @@ msgstr ""
 "<Ctrl-m>, faks-<Ctrl-f> ali e-pošta-<Ctrl-m>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2003,14 +2044,16 @@ msgid "Browse for temporary directory"
 msgstr "Prebrskaj začasni imenik"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Kakovost v odstotkih, če sliko shranjujemo v zapisih TIFF ali JPEG pri "
 "stiskanju z JPEG"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Stiskanje, če je slika shranjena kot png"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2018,19 +2061,23 @@ msgid "Minimum length of counter in filename"
 msgstr "Najkrajša dolžina števca v imenu datoteke"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+#, fuzzy
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Stopnja stiskanja za zip stiskani TIFF (zmanjšanje)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Vrsta stiskanja, če je 16 bitna slika shranjena kot tiff"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Vrsta stiskanja, če je 8 bitna slika shranjena kot tiff"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Vrsta stiskanja pri shranjevanju slik v načinu lineart v zapisu TIFF"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2063,10 +2110,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr "stiskanje PDFslike z zlib algoritmom."
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Če naj bo 16 bitna slika shranjena v pnm formatu, uporabi ASCII format "
@@ -2120,7 +2168,8 @@ msgid "Select how a range is displayed"
 msgstr "Izberi, kako je območje prikazano"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Vrednost, s katero je izračunana ločljivost predogleda pomnožena"
 
 #. DESC_PREVIEW_GAMMA
@@ -2184,8 +2233,9 @@ msgid "dimension of square that is used to average color for pipette function"
 msgstr "velikost kvadrata, v katerem povprečimo barvo pri zajemu s pipeto."
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Podajte ukaz, s katerim prikažemo datoteke za pomoč, mora biti ogledovalnik "
 "HTML kode!"
@@ -2195,8 +2245,9 @@ msgid "Change gamma value when autoenhancement button is pressed"
 msgstr ""
 "Spremeni vrednost gama, ko je pritisnjen gumb za samodejno izboljševanje"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "Izberi področje skeniranja, potem ko je predogled skeniranja zaključen"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2282,28 +2333,34 @@ msgid "port to connect to POP3 server"
 msgstr "vrata za povezavo do POP3 strežnika"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+#, fuzzy
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "Pošta je poslana v html načinu, postavi sliko z: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Podajte ukaz za zagon ocr programa"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Podajte izbiro ocr programa za določitev vhodne datoteke"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Podajte izbiro ocr programa za določitev izhodne datoteke"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Določi, če ocr program podpira GUI cevovod napredka"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Podajte izbiro ocr programa za določitev opisa izhodne datoteke v GUI načinu"
 
@@ -2341,7 +2398,8 @@ msgid "Pick black point"
 msgstr "Izberite črno točko"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Uporabi celotno območje "
 
 #. DESC_ZOOM_OUT
@@ -2365,12 +2423,14 @@ msgstr "Prekliči zadnje povečanje"
 msgid "Select visible area"
 msgstr "Izberi vidno območje"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Samodejno določi območje skeniranja"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Samodejno povečaj območje skeniranja"
 
 #. DESC_DELETE_IMAGES
@@ -2378,9 +2438,10 @@ msgid "Delete preview image cache"
 msgstr "Izbriši predpomnilnik predogleda slike"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Prednastavljeno območje:\n"
@@ -2412,15 +2473,18 @@ msgid "Clone image"
 msgstr "Kloniraj sliko"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Rotiraj sliko za 90 stopinj"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Rotiraj sliko za 180 stopinj"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Rotiraj sliko za 270 stopinj"
 
 #. DESC_MIRROR_X
@@ -2456,11 +2520,13 @@ msgid "Y-Scale factor"
 msgstr "Faktor skeliranja Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Skeliraj sliko v dolžino [v pikslih]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Skeliraj sliko v višino [v pikslih]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2582,7 +2648,8 @@ msgid "Failed to open"
 msgstr "Napaka pri odpiranju"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Ne morem ustvariti varne datoteke (mogoče povezava ne obstaja):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2659,8 +2726,9 @@ msgid "Failed to execute fax command:"
 msgstr "Napaka pri zagonu ukaza za faskiranje:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Napaka pri zagonu ocr ukaza:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Napaka pri zagonu ukaza za faskiranje:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2720,11 +2788,12 @@ msgid "warning: option has no value constraint"
 msgstr "opozorilo: izbira nima vrednosti omejitve"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "X Sane ste poskušali pognati kot korenski uporabnik, to je zares NEVARNO!\n"
@@ -2976,6 +3045,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Toolbox>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -2983,7 +3053,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Mogoči vzroki:\n"
@@ -3178,7 +3248,8 @@ msgid "E-mail has been sent"
 msgstr "E-pošta je bila poslana"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Preverjanje čakalne vrste faksa"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3240,6 +3311,24 @@ msgstr "Zmanjkalo je pomnilnika"
 msgid "Access to resource has been denied"
 msgstr "Dostop do vira je bil zavrnjen"
 
+#~ msgid "XSane options"
+#~ msgstr "Izbire XSane"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Napaka pri zagonu ocr ukaza:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Barvna ločljivost (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Vrednost gama za tiskalnik:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Gama zelena za tiskalnik:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Gama modra za tiskalnik:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Odstrani tiskalnik"
diff --git a/po/sr.gmo b/po/sr.gmo
index a4f11f9..1d33769 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
index 60b017b..47b9316 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,20 +1,22 @@
+# translation of sr.po to Српски
+# translation of sr.po to
 # Serbian translation for XSane.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Rusmir Duškor <drusmir@gmx.ch>, 2002.
+# Copyright (C) 2001, 2007 Free Software Foundation, Inc.
 #
 #
+# Русмир Душко <drusmir@gmx.ch>, 2002, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: XSANE 0.76\n"
+"Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
-"PO-Revision-Date: 2002-01-17 00:47GMT\n"
-"Last-Translator: Rusmir Duško <drusmir@gmx.ch>\n"
-"Language-Team: srpski <sr@li.org>\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
+"PO-Revision-Date: 2007-09-22 21:09+0200\n"
+"Last-Translator: Русмир Душко <drusmir@gmx.ch>\n"
+"Language-Team: Српски <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.2\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Please translate this to the correct directory name (eg. german=>de)
 #. XSANE_LANGUAGE_DIR
@@ -28,710 +30,674 @@ msgstr "(c)"
 #. can be translated with \251
 #. FILENAME_PREFIX_CLONE_OF
 msgid "clone-of-"
-msgstr ""
+msgstr "копија од"
 
 #. WINDOW_ABOUT_XSANE
 msgid "About"
-msgstr "O programu"
+msgstr "О програму"
 
 #. WINDOW_ABOUT_TRANSLATION, MENU_ITEM_ABOUT_TRANSLATION
 #. MENU_ITEM_ABOUT_TRANSLATION
 msgid "About translation"
-msgstr "O prevodu"
+msgstr "О преводу"
 
 #. WINDOW_AUTHORIZE
 msgid "authorization"
-msgstr "autorizacija"
+msgstr "ауторизација "
 
 #. WINDOW_GPL
 msgid "GPL - the license"
-msgstr ""
+msgstr "GPL - лиценца"
 
 #. WINDOW_EULA
 msgid "End User License Agreement"
-msgstr ""
+msgstr "Лиценца за корисника"
 
 #. WINDOW_INFO
 msgid "info"
-msgstr "podatci"
+msgstr "информација"
 
 #. WINDOW_LOAD_BATCH_LIST
 msgid "load batch list"
-msgstr ""
+msgstr "отвори пакет"
 
 #. WINDOW_SAVE_BATCH_LIST
 msgid "save batch list"
-msgstr ""
+msgstr "запамти пакет"
 
 #. WINDOW_BATCH_SCAN
 msgid "batch scan"
-msgstr "paketno skeniranje"
+msgstr "пакетно скенирање"
 
 #. WINDOW_BATCH_RENAME
-#, fuzzy
 msgid "rename batch area"
-msgstr "Izbriši stranu"
+msgstr "преименуј пакет"
 
 #. WINDOW_FAX_PROJECT
 msgid "fax project"
-msgstr "Faks"
+msgstr "Факс пројект"
 
 #. WINDOW_FAX_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for fax project"
-msgstr "Unesi ime projekta za faks"
+msgstr "Унеси име пројекта за факс"
 
 #. WINDOW_FAX_RENAME
 msgid "rename fax page"
-msgstr "preimenuj stranu sa faksom"
+msgstr "преименуј страницу факса"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
-msgstr "unesi ps-fajl u faks"
+msgid "insert PS-file into fax"
+msgstr "унеси PS фајлу у факс"
 
 #. WINDOW_EMAIL_PROJECT
-#, fuzzy
 msgid "E-mail project"
-msgstr "e-pošta"
+msgstr "Пројект е-поште"
 
 #. WINDOW_EMAIL_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for email project"
-msgstr "Unesi ime projekta za E-poštu"
+msgstr "Унеси име пројекта за е-пошту"
 
 #. WINDOW_EMAIL_RENAME
-#, fuzzy
 msgid "rename e-mail image"
-msgstr "preimenuj stranu sa e-poštom"
+msgstr "преименуј слику у е-пошти"
 
 #. WINDOW_EMAIL_INSERT
-#, fuzzy
 msgid "insert file into e-mail"
-msgstr "unesi sliku u e-poštu"
+msgstr "унеси фајлу у е-пошту"
 
 #. WINDOW_MULTIPAGE_PROJECT
-#, fuzzy
 msgid "multipage project"
-msgstr "Izbriši projekat"
+msgstr "многоструки пројект"
 
 #. WINDOW_MULTIPAGE_PROJECT_BROWSE
-#, fuzzy
 msgid "browse for multipage project"
-msgstr "Izbriši projekat"
+msgstr "тражи многоструки пројект"
 
 #. WINDOW_PRESET_AREA_RENAME
 msgid "rename preset area"
-msgstr "preimenuj prepodešavanja"
+msgstr "преименуј преподешавања"
 
 #. WINDOW_PRESET_AREA_ADD
-#, fuzzy
 msgid "add preset area"
-msgstr "preimenuj prepodešavanja"
+msgstr "додај преподешавања"
 
 #. WINDOW_MEDIUM_RENAME
-#, fuzzy
 msgid "rename medium"
-msgstr "Izaberi izvor medijuma"
+msgstr "преименуј уређај"
 
 #. WINDOW_MEDIUM_ADD
-#, fuzzy
 msgid "add new medium"
-msgstr "Izaberi izvor medijuma"
+msgstr "додај нов уређај"
 
 #. WINDOW_SETUP
 msgid "setup"
-msgstr "Konfiguracija"
+msgstr "Конфигурација"
 
 #. WINDOW_HISTOGRAM
 msgid "Histogram"
-msgstr "Histogram"
+msgstr "Хистограм"
 
 #. WINDOW_GAMMA
 msgid "Gamma curve"
-msgstr "Gama krivina"
+msgstr "Гама кривина"
 
 #. WINDOW_STANDARD_OPTIONS
 msgid "Standard options"
-msgstr "Standarni izbori"
+msgstr "Стандарне опције"
 
 #. WINDOW_ADVANCED_OPTIONS
 msgid "Advanced options"
-msgstr "Napredni izbori"
+msgstr "Напредне опцијеi"
 
 #. WINDOW_DEVICE_SELECTION
 msgid "device selection"
-msgstr "biranje uređaja"
+msgstr "бирање уређаја"
 
 #. WINDOW_PREVIEW
 msgid "Preview"
-msgstr "Pregled"
+msgstr "Преглед"
 
 #. WINDOW_VIEWER
 #. MENU_ITEM_VIEWER
 msgid "Viewer"
-msgstr "Prikazivač"
+msgstr "Приказивач"
 
 #. WINDOW_VIEWER_OUTPUT_FILENAME
 msgid "Viewer: select output filename"
-msgstr "Prikazivač: izaberi izlazni naziv fajla"
+msgstr "Приказивач: изабери излазни назив фајле "
 
 #. WINDOW_OCR_OUTPUT_FILENAME
 msgid "Select output filename for OCR text file"
-msgstr "Izaberi izlazni naziv fajla za OCR tekst fajl"
+msgstr "Изабери назив фајле за OCR текстуални фајлl"
 
 #. WINDOW_OUTPUT_FILENAME
 msgid "select output filename"
-msgstr "Odredi izlazni naziv fajla"
+msgstr "Одреди излазни назив фајле"
 
 #. WINDOW_SAVE_SETTINGS
 msgid "save device settings"
-msgstr "Zapamti podešavanja uređaja"
+msgstr "Запамти подешавања уређаја"
 
 #. WINDOW_LOAD_SETTINGS
 msgid "load device settings"
-msgstr "Učitaj podešavanja uređaja"
+msgstr "Учитај подешавања уређаја"
 
 #. WINDOW_CHANGE_WORKING_DIR
 msgid "change working directory"
-msgstr "Promeni radnu granu"
+msgstr "Промени радну директорију"
 
 #. WINDOW_TMP_PATH
 msgid "select temporary directory"
-msgstr "Izaberi privremeni direktorijum"
+msgstr "Изабери привремену директорију"
 
 #. WINDOW_SCALE
 #. DESC_VIEWER_SCALE
 msgid "Scale image"
-msgstr "Skaliraj sliku"
+msgstr "Скалирај слику"
 
 #. WINDOW_DESPECKLE
 #. DESC_VIEWER_DESPECKLE
 msgid "Despeckle image"
-msgstr "Odstrani fleke"
+msgstr "Одстрани флеке"
 
 #. WINDOW_BLUR
 #. DESC_VIEWER_BLUR
 msgid "Blur image"
-msgstr "Zamagli sliku"
+msgstr "Замагли слику"
 
 #. WINDOW_STORE_MEDIUM
-#, fuzzy
 msgid "Store medium definition"
-msgstr "Preimenuj definiciju"
+msgstr "Запамти дефиницију уређаја"
 
 #. WINDOW_NO_DEVICES
-#, fuzzy
 msgid "No devices available"
-msgstr "Nijedan uređaj nije dostupan"
+msgstr "Ниједан уређај није доступан"
 
 #. WINDOW_SCANNER_DEFAULT_COLOR_ICM_PROFILE
-#, fuzzy
 msgid "select scanner default color ICM-profile"
-msgstr "Odstrani štampač"
+msgstr "Изабери за скенер подразумевани ICM профил за боју"
 
 #. WINDOW_SCANNER_DEFAULT_GRAY_ICM_PROFILE
-#, fuzzy
 msgid "select scanner default gray ICM-profile"
-msgstr "Odstrani štampač"
+msgstr "Изабери за скенер подразумевани грао ICM профил"
 
 #. WINDOW_DISPLAY_ICM_PROFILE
 msgid "select display ICM-profile"
-msgstr ""
+msgstr "Изабери ICM профил за екран"
 
 #. WINDOW_CUSTOM_PROOFING_ICM_PROFILE
-#, fuzzy
 msgid "select custom proofing ICM-profile"
-msgstr "Odredi izlazni naziv fajla"
+msgstr "Одабери избор корисника за пробни ICM профил"
 
 #. WINDOW_WORKING_COLOR_SPACE_ICM_PROFILE
-#, fuzzy
 msgid "select working color space ICM-profile"
-msgstr "Odstrani štampač"
+msgstr "Изабери радно место ICM профила за боју"
 
 #. WINDOW_PRINTER_ICM_PROFILE
-#, fuzzy
 msgid "select printer ICM-profile"
-msgstr "Odstrani štampač"
+msgstr "Изабери штампач ICM профила"
 
 #. MENU_FILE
 msgid "File"
-msgstr "Fajl"
+msgstr "Фајла"
 
 #. MENU_PREFERENCES
 msgid "Preferences"
-msgstr "Podešavanja"
+msgstr "Подешавања"
 
 #. MENU_VIEW
 msgid "View"
-msgstr "Pogled"
+msgstr "Поглед"
 
 #. MENU_WINDOW
 msgid "Window"
-msgstr ""
+msgstr "Окна"
 
 #. MENU_HELP
 #. BUTTON_HELP
 msgid "Help"
-msgstr "Pomoć"
+msgstr "Помоћ"
 
 #. MENU_EDIT
 msgid "Edit"
-msgstr ""
+msgstr "Промени"
 
 #. MENU_FILTERS
 msgid "Filters"
-msgstr "Filteri"
+msgstr "Филтери"
 
 #. MENU_GEOMETRY
 msgid "Geometry"
-msgstr ""
+msgstr "Геометрија"
 
 #. MENU_COLOR_MANAGEMENT
 #. NOTEBOOK_COLOR_MANAGEMENT_OPTIONS
 msgid "Color management"
-msgstr ""
+msgstr "Управљање са бојом"
 
 #. MENU_ITEM_ABOUT_XSANE
 msgid "About XSane"
-msgstr "O programu XSane"
+msgstr "О програму XSane"
 
 #. MENU_ITEM_INFO
 msgid "Info"
-msgstr "Informacije"
+msgstr "Информације"
 
 #. MENU_ITEM_QUIT
 msgid "Quit"
-msgstr "Izlaz"
+msgstr "Изађи"
 
 #. MENU_ITEM_SAVE_IMAGE
 #. DESC_VIEWER_SAVE
 msgid "Save image"
-msgstr "Zapamti sliku"
+msgstr "Запамти слику"
 
 #. MENU_ITEM_OCR
 msgid "OCR - save as text"
-msgstr ""
+msgstr "OCR - запамти као текст"
 
 #. MENU_ITEM_CLONE
 msgid "Clone"
-msgstr "Kopiraj"
+msgstr "Направи копију"
 
 #. MENU_ITEM_SCALE
 msgid "Scale"
-msgstr "Promeni veličinu"
+msgstr "Промени величину"
 
 #. MENU_ITEM_CLOSE
 #. BUTTON_CLOSE
 msgid "Close"
-msgstr "Zatvori"
+msgstr "Затвори"
 
 #. MENU_ITEM_UNDO
 msgid "Undo"
-msgstr ""
+msgstr "Врати"
 
 #. MENU_ITEM_DESPECKLE
 msgid "Despeckle"
-msgstr "odflekati"
+msgstr "одфлекати"
 
 #. MENU_ITEM_BLUR
 msgid "Blur"
-msgstr "zamagli"
+msgstr "Замагли"
 
 #. MENU_ITEM_ROTATE90
 msgid "Rotate 90"
-msgstr ""
+msgstr "Окрени за 90 степени"
 
 #. MENU_ITEM_ROTATE180
-#, fuzzy
 msgid "Rotate 180"
-msgstr "Rotiraj sliku za 180 stepeni"
+msgstr "Окрени за180 степени"
 
 #. MENU_ITEM_ROTATE270
-#, fuzzy
 msgid "Rotate 270"
-msgstr "Rotiraj sliku za 270 stepeni"
+msgstr "Окрени за 270 степени"
 
 #. MENU_ITEM_MIRROR_X
-#, fuzzy
 msgid "Mirror |"
-msgstr "greška"
+msgstr "Окрени по хоризонтали |"
 
 #. MENU_ITEM_MIRROR_Y
-#, fuzzy
 msgid "Mirror -"
-msgstr "greška"
+msgstr "Окрени по вертикали  -"
 
 #. FRAME_RAW_IMAGE
 msgid "Raw image"
-msgstr "sirova slika"
+msgstr "Сирова слика"
 
 #. FRAME_ENHANCED_IMAGE
 msgid "Enhanced image"
-msgstr "Poboljšana slika"
+msgstr "Побољшана слика"
 
 #. BUTTON_SCAN
-#, fuzzy
 msgid "Scan"
-msgstr "Skeniranje"
+msgstr "Скенирање"
 
 #. BUTTON_OK
 msgid "Ok"
-msgstr "U redu"
+msgstr "У реду"
 
 #. BUTTON_ACCEPT
 msgid "Accept"
-msgstr "Prihvati"
+msgstr "Прихвати"
 
 #. BUTTON_NOT_ACCEPT
 msgid "Not accept"
-msgstr "Nije prihvaćeno"
+msgstr "Отказано"
 
 #. BUTTON_APPLY
 msgid "Apply"
-msgstr "Primeni"
+msgstr "Примени"
 
 #. BUTTON_CANCEL
 msgid "Cancel"
-msgstr "Prekini"
+msgstr "Прекини"
 
 #. BUTTON_REDUCE
 msgid "Reduce"
-msgstr "Smanji"
+msgstr "Смањи"
 
 #. BUTTON_CONT_AT_OWN_RISK
 msgid "Continue at your own risk"
-msgstr "Nastavi na sopstvenu odgovornost"
+msgstr "Настави на сопствену одговорност"
 
 #. BUTTON_BROWSE
 msgid "Browse"
-msgstr "Pretraži"
+msgstr "Претражи"
 
 #. BUTTON_OVERWRITE
 msgid "Overwrite"
-msgstr "Prepiši"
+msgstr "Препиши"
 
 #. BUTTON_BATCH_LIST_SCAN
-#, fuzzy
 msgid "Scan batch list"
-msgstr "Saveti za skeniranje"
+msgstr "Скенирај пакете"
 
 #. BUTTON_BATCH_AREA_SCAN
-#, fuzzy
 msgid "Scan selected area"
-msgstr "Uvećavaj u izabrano područje"
+msgstr "Скенирај изабрано подручје"
 
 #. BUTTON_PAGE_DELETE
 msgid "Delete page"
-msgstr "Izbriši stranu"
+msgstr "Избриши страницу"
 
 #. BUTTON_PAGE_SHOW
 msgid "Show page"
-msgstr "Prikaži pregled"
+msgstr "Прикажи страницу"
 
 #. BUTTON_PAGE_RENAME
 msgid "Rename page"
-msgstr "Preimenuj stranu"
+msgstr "Преименуј страницу"
 
 #. BUTTON_IMAGE_DELETE
 msgid "Delete image"
-msgstr "Izbriši sliku"
+msgstr "Избриши слику"
 
 #. BUTTON_IMAGE_SHOW
 msgid "Show image"
-msgstr "Pokaži sliku"
+msgstr "Покажи слику"
 
 #. BUTTON_IMAGE_EDIT
-#, fuzzy
 msgid "Edit image"
-msgstr "Poboljšana slika"
+msgstr "Промени слику"
 
 #. BUTTON_IMAGE_RENAME
 msgid "Rename image"
-msgstr "Preimenuj sliku"
+msgstr "Преименуј слику"
 
 #. BUTTON_FILE_INSERT
 msgid "Insert file"
-msgstr "Unesi fajl"
+msgstr "Унеси фајлу"
 
 #. BUTTON_CREATE_PROJECT
 msgid "Create project"
-msgstr "Uradi projekat"
+msgstr "Направи пројект"
 
 #. BUTTON_SEND_PROJECT
 msgid "Send project"
-msgstr "Pošalji projekat"
+msgstr "Пошаљи пројект"
 
 #. BUTTON_SAVE_MULTIPAGE
-#, fuzzy
 msgid "Save multipage file"
-msgstr "Zapamti sliku"
+msgstr "Запамти многоструку фајлу"
 
 #. BUTTON_DELETE_PROJECT
 msgid "Delete project"
-msgstr "Izbriši projekat"
+msgstr "Избриши пројект"
 
 #. BUTTON_ADD_PRINTER
 msgid "Add printer"
-msgstr "Dodaj štampač"
+msgstr "Додај штампач"
 
 #. BUTTON_DELETE_PRINTER
 msgid "Delete printer"
-msgstr "Odstrani štampač"
+msgstr "Одстрани штампач"
 
 #. BUTTON_PREVIEW_ACQUIRE
 msgid "Acquire preview"
-msgstr "Uradi pregled"
+msgstr "Уради преглед"
 
 #. BUTTON_PREVIEW_CANCEL
 msgid "Cancel preview"
-msgstr "Prekini pregled"
+msgstr "Прекини преглед"
 
 #. BUTTON_DISCARD_IMAGE
 msgid "Discard image"
-msgstr "Odbaci sliku"
+msgstr "Одбаци слику"
 
 #. BUTTON_DISCARD_ALL_IMAGES
 msgid "Discard all images"
-msgstr "Odbaci sve slike"
+msgstr "Одбаци све слике"
 
 #. BUTTON_DO_NOT_CLOSE
 msgid "Do not close"
-msgstr "Ne zatvaraj"
+msgstr "Не затварај"
 
 #. BUTTON_SCALE_BIND
 msgid "Bind scale"
-msgstr "Poveži skaliranja"
+msgstr "Запамти скалу"
 
 #. RADIO_BUTTON_FINE_MODE
 msgid "Fine mode"
-msgstr "Tačan modus"
+msgstr "Фини модус"
 
 #. RADIO_BUTTON_HTML_EMAIL
-#, fuzzy
 msgid "HTML e-mail"
-msgstr "HTML e-pošta"
+msgstr "HTML е-пошта"
 
 #. RADIO_BUTTON_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device preferences at exit"
-msgstr "Zapamti podešavanja uređaja pri izlazu"
+msgstr "Запамти подешавања уређаја при излазу"
 
 #. RADIO_BUTTON_OVERWRITE_WARNING
 msgid "Overwrite warning"
-msgstr "Prepiši upozorenje"
+msgstr "Препиши упозорење"
 
 #. RADIO_BUTTON_SKIP_EXISTING_NRS
 msgid "Skip existing filenames"
-msgstr "Preskoči postojeće nazive fajli"
+msgstr "Прескочи постојеће називе фајли"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
-msgstr ""
+msgid "Save postscript zlib compressed (PS level 3)"
+msgstr "Запамти као postscript компресован са zlib (PS level 3)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
 msgid "Save PDF zlib compressed"
-msgstr ""
+msgstr "Запамти као PDF компресован са zlib"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
-msgstr ""
+msgid "Save 16bit PNM in ASCII format"
+msgstr "Запамти 16 битни PNM у ASCII формату"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
 msgid "Reduce 16 bit image to 8 bit"
-msgstr "Smanji 16 bitnu sliku na 8 bita"
+msgstr "Смањи 16 битну слику на 8 бита"
 
 #. RADIO_BUTTON_WINDOW_FIXED
 msgid "Main window size fixed"
-msgstr "Veličina glavnog prozora je postavljena"
+msgstr "Величина главног прозора је постављена"
 
 #. RADIO_BUTTON_DISABLE_GIMP_PREVIEW_GAMMA
-#, fuzzy
 msgid "Disable GIMP preview gamma"
-msgstr "Onemogući gama pri pregledu u gimpu"
+msgstr "Онемогући гама при прегледу у GIMP-у"
 
 #. RADIO_BUTTON_PRIVATE_COLORMAP
 msgid "Use private colormap"
-msgstr "Upotrebi privatnu paletu boja"
+msgstr "Употреби приватну палету боја"
 
 #. RADIO_BUTTON_AUTOENHANCE_GAMMA
 msgid "Autoenhance gamma"
-msgstr "Automatsko poboljšanje faktora gama"
+msgstr "Аутоматско побољшање фактора гама"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
-msgstr "Automatsko biranje površine skeniranja"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+msgid "Preselect scan area"
+msgstr "Преподешена површина скенирања"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
 msgid "Autocorrect colors"
-msgstr "Autokorektura boja"
+msgstr "Аутоматска коректура боја"
 
 #. RADIO_BUTTON_OCR_USE_GUI_PIPE
 msgid "Use GUI progress pipe"
-msgstr ""
+msgstr "Користи напредак GUI цеви"
 
 #. RADIO_BUTTON_CMS_BPC
 #. MENU_ITEM_CMS_BLACK_POINT_COMPENSATION
 msgid "Black point compensation"
-msgstr ""
+msgstr "Компензација црне тачке"
 
 #. TEXT_SCANNING_DEVICES
 msgid "scanning for devices"
-msgstr "Skeniranje uređaja"
+msgstr "Скенирање уређаја"
 
 #. TEXT_AVAILABLE_DEVICES
 msgid "Available devices:"
-msgstr "Dostupni uređaji"
-
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "XSane opcije"
+msgstr "Доступни уређаји"
 
 #. TEXT_FILETYPE
 msgid "Type"
-msgstr "Vrsta"
+msgstr "Врста"
 
 #. TEXT_CMS_FUNCTION
 #. DESC_CMS_FUNCTION
-#, fuzzy
 msgid "Color management function"
-msgstr "pun opseg"
+msgstr "Подешавање боје"
 
 #. TEXT_SCANNER_BACKEND
 msgid "Scanner and backend:"
-msgstr "Skener i backend"
+msgstr "Скенер и додатци:"
 
 #. TEXT_VENDOR
 msgid "Vendor:"
-msgstr "Proizvođač:"
+msgstr "Произвођач:"
 
 #. TEXT_MODEL
 msgid "Model:"
-msgstr "Model:"
+msgstr "Модел:"
 
 #. TEXT_TYPE
 msgid "Type:"
-msgstr "Vrsta:"
+msgstr "Врста:"
 
 #. TEXT_DEVICE
 msgid "Device:"
-msgstr "Uređaj:"
+msgstr "Уређај:"
 
 #. TEXT_LOADED_BACKEND
 msgid "Loaded backend:"
-msgstr "Podignut backend:"
+msgstr "Учитани додатак:"
 
 #. TEXT_SANE_VERSION
 msgid "Sane version:"
-msgstr "Sane verzija:"
+msgstr "Верзија Sane:"
 
 #. TEXT_RECENT_VALUES
 msgid "Recent values:"
-msgstr "Zadnje vrednosti:"
+msgstr "Задње вредности:"
 
 #. TEXT_GAMMA_CORR_BY
 msgid "Gamma correction by:"
-msgstr "Gama korekcija:"
+msgstr "Исправка гаме са:"
 
 #. TEXT_SCANNER
 msgid "scanner"
-msgstr "skener"
+msgstr "скенер"
 
 #. TEXT_SOFTWARE_XSANE
 msgid "software (XSane)"
-msgstr "program (Xsane)"
+msgstr "програм (XSane)"
 
 #. TEXT_NONE
 msgid "none"
-msgstr "bez"
+msgstr "нема"
 
 #. TEXT_GAMMA_INPUT_DEPTH
 msgid "Gamma input depth:"
-msgstr "Dubina bita ulazne game:"
+msgstr "Улазна дубина гаме:"
 
 #. TEXT_GAMMA_OUTPUT_DEPTH
 msgid "Gamma output depth:"
-msgstr "Dubina bita izlazne game:"
+msgstr "Излазна дубина гаме:"
 
 #. TEXT_SCANNER_OUTPUT_DEPTH
 msgid "Scanner output depth:"
-msgstr "Dubina bita izlaza skenera: "
+msgstr "Излазна дубина скенера:"
 
 #. TEXT_OUTPUT_FORMATS
 msgid "XSane output formats:"
-msgstr "Xsane izlazni formati:"
+msgstr "Излазни формати XSane:"
 
 #. TEXT_8BIT_FORMATS
 msgid "8 bit output formats:"
-msgstr "8-bitni izlazni formati:"
+msgstr "8 битни излазни формати:"
 
 #. TEXT_16BIT_FORMATS
 msgid "16 bit output formats:"
-msgstr "16-bitni izlazni formati:"
+msgstr "16 битни излазни формати:"
 
 #. TEXT_REDUCE_16BIT_TO_8BIT
-#, fuzzy
 msgid ""
 "Bit depth 16 bits/channel is not supported for this output format.\n"
 "Do you want to reduce the depth to 8 bits/channel?"
 msgstr ""
-"Dubina 16 bit-a u boji nije podržana za ovaj format.\n"
-"Da li želite da smanjite dubinu na 8 bit-a u boji?"
+"Дубина 16 бита у боји није подржана за овај формат.\n"
+"Да ли желите да смањите дубину на 8 бита у боји?"
 
 #. TEXT_AUTHORIZATION_REQ
 msgid "Authorization required for"
-msgstr "Zahtevana potvrda za"
+msgstr "Ауторизација је потребна за"
 
 #. TEXT_AUTHORIZATION_SECURE
 msgid "Password transmission is secure"
-msgstr "Prenos lozinke je siguran"
+msgstr "Пренос лозинке је сигуран"
 
 #. TEXT_AUTHORIZATION_INSECURE
 msgid "Backend requests plain-text password"
-msgstr "Backend zahteva nešifrovanu lozinku"
+msgstr "Додатак захтева нешифровану лозинку"
 
 #. TEXT_USERNAME
 msgid "Username :"
-msgstr "Korisnik:"
+msgstr "Корисник:"
 
 #. TEXT_PASSWORD
 msgid "Password :"
-msgstr "Lozinka:"
+msgstr "Лозинка:"
 
 #. TEXT_INVALID_PARAMS
 msgid "Invalid parameters."
-msgstr "Nevažeći parametri."
+msgstr "Неважећи параметри."
 
 #. TEXT_VERSION
 msgid "version:"
-msgstr "Verzija:"
+msgstr "Верзија:"
 
 #. TEXT_PACKAGE
 msgid "package"
-msgstr "paket"
+msgstr "пакет"
 
 #. TEXT_WITH_CMS_FUNCTION
-#, fuzzy
 msgid "with color management function"
-msgstr "pun opseg"
+msgstr "са подешавањем боје"
 
 #. TEXT_WITH_GIMP_SUPPORT
 msgid "with GIMP support"
-msgstr "sa podrškom GIMP-a"
+msgstr "са подршком GIMP-а"
 
 #. TEXT_WITHOUT_GIMP_SUPPORT
 msgid "without GIMP support"
-msgstr "bez podrške GIMP-a"
+msgstr "без подршке GIMP-а"
 
 #. TEXT_GTK_VERSION
 msgid "compiled with GTK-"
-msgstr "prevedeno sa podrškom za GTK-"
+msgstr "преведено са подршком за GTK-"
 
 #. TEXT_GIMP_VERSION
 msgid "compiled with GIMP-"
-msgstr "prevedeno sa podrškom GIMP-a"
+msgstr "преведено са подршком GIMP-а"
 
 #. TEXT_UNKNOWN
 msgid "unknown"
-msgstr "nepoznato"
+msgstr "непознато"
 
 #. TEXT_EULA
 msgid ""
@@ -747,6 +713,17 @@ msgid ""
 "have to read, understand and accept the following\n"
 "\"NO WARRANTY\" agreement.\n"
 msgstr ""
+"XSane се дистрибура под условима GNU General Public Licence\n"
+"коју је објавила Free Software Foundation,\n"
+"или верзија 2 од ове лиценце, или (по вашој жељи) свака следећа верзија.\n"
+"Овај прогам се дистрибуира за жељом, да ће бити користан, без ИКАКВЕ "
+"ГАРАНЦИЈЕ;\n"
+"без употребне вредности за неку одређену сврху.\n"
+"Ако овај програм вам донесе неку штету, ви сами сносит све сервисне "
+"трошкове, поправке.\n"
+"Да би користили овај програм, ви требате да читате, разумете и прихватите "
+"следећи\n"
+"\"NO WARRANTY\" споразум.\n"
 
 #. TEXT_GPL
 msgid ""
@@ -758,38 +735,42 @@ msgid ""
 "WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
+"XSane се дистрибура под условима GNU General Public Licence\n"
+"коју је објавила Free Software Foundation,\n"
+"или верзија 2 од ове лиценце, или (по вашој жељи) свака следећа верзија.\n"
+"Овај прогам се дистрибуира за жељом, да ће бити користан, без ИКАКВЕ "
+"ГАРАНЦИЈЕ;\n"
+"без употребне вредности за неку одређену сврху.\n"
 
 #. TEXT_EMAIL_ADR
-#, fuzzy
 msgid "E-mail:"
-msgstr "E-pošta:"
+msgstr "Е-пошта:"
 
 #. TEXT_HOMEPAGE
 msgid "Homepage:"
-msgstr "lični Web sajt:"
+msgstr "Лична Web страница:"
 
 #. TEXT_FILE
 msgid "File:"
-msgstr "Fajl:"
+msgstr "Фајла:"
 
 #. TEXT_TRANSLATION
 msgid "Translation:"
-msgstr "Prevod:"
+msgstr "Превод:"
 
 #. Please translate this to something like
 #. translation to YOUR LANGUAGE\n
 #. by YOUR NAME\n
 #. E-mail: your.name@yourdomain.com\n
 #. TEXT_TRANSLATION_INFO
-#, fuzzy
 msgid ""
 "untranslated original english text\n"
 "by Oliver Rauch\n"
 "E-mail: Oliver.Rauch@rauch-domain.de\n"
 msgstr ""
-"prevod iz engleskog teksta\n"
-"Rusmir Duško\n"
-"E-pošta: drusmir@gmx.ch\n"
+"превод из енглеског текста\n"
+"Русмир Душко\n"
+"Е-пошта: drusmir@gmx.ch\n"
 
 #. TEXT_INFO_BOX
 msgid "0x0: 0KB"
@@ -797,222 +778,217 @@ msgstr "0x0: 0KB"
 
 #. TEXT_ADF_PAGES_SCANNED
 msgid "Scanned pages: "
-msgstr "Skenirane strane: "
+msgstr "Скениране стране: "
 
 #. TEXT_EMAIL_TEXT
-#, fuzzy
 msgid "E-mail text:"
-msgstr "E-pošta:"
+msgstr "Текст е-поште:"
 
 #. TEXT_ATTACHMENTS
 msgid "Attachments:"
-msgstr "Dodatci:"
+msgstr "Додатак:"
 
 #. TEXT_EMAIL_STATUS
 msgid "Project status:"
-msgstr "Status projekta:"
+msgstr "Статус пројекта:"
 
 #. TEXT_EMAIL_FILETYPE
 msgid "E-mail image filetype:"
-msgstr ""
+msgstr "Тип фајле слике е-поште:"
 
 #. TEXT_PAGES
-#, fuzzy
 msgid "Pages:"
-msgstr "Upotreba:"
+msgstr "Странице:"
 
 #. TEXT_MULTIPAGE_FILETYPE
 msgid "Multipage document filetype:"
-msgstr ""
+msgstr "Тип многостручног документа"
 
 #. TEXT_MEDIUM_DEFINITION_NAME
 msgid "Medium Name:"
-msgstr ""
+msgstr "Име уређаја:"
 
 #. TEXT_VIEWER_IMAGE_INFO
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Size %d x %d pixel, %d bits/channel, %d channels, %1.0f dpi x %1.0f dpi, %"
 "1.1f %s"
 msgstr ""
-"Veličina %d x %d piksxel, %d bit/boji, %d boja, %1.0f dpi x %1.0f dpi, %1.1f "
-"%s"
+"Величина %d x %d тачка, %d бита/каналу, %d канала, %1.0f dpi x %1.0f dpi, %"
+"1.1f %s"
 
 #. TEXT_DESPECKLE_RADIUS
 msgid "Despeckle radius:"
-msgstr "Radijus odflekivanja:"
+msgstr "Радијус одфлекивања:"
 
 #. TEXT_BLUR_RADIUS
 msgid "Blur radius:"
-msgstr "Radijus zamaglivanja:"
+msgstr "Радијус замагливања:"
 
 #. TEXT_BATCH_AREA_DEFAULT_NAME
-#, fuzzy
 msgid "(no name)"
-msgstr "(ništa)"
+msgstr "(без имена)"
 
 #. TEXT_BATCH_LIST_AREANAME
-#, fuzzy
 msgid "Area name:"
-msgstr "Korisnik:"
+msgstr "Име подручја:"
 
 #. TEXT_BATCH_LIST_SCANMODE
-#, fuzzy
 msgid "Scanmode:"
-msgstr "Način rada XSane"
+msgstr "Начин скенирања:"
 
 #. TEXT_BATCH_LIST_GEOMETRY_TL
 msgid "Top left:"
-msgstr ""
+msgstr "Горе лево:"
 
 #. TEXT_BATCH_LIST_GEOMETRY_SIZE
-#, fuzzy
 msgid "Size:"
-msgstr "Dia"
+msgstr "Величина:"
 
 #. TEXT_BATCH_LIST_RESOLUTION
-#, fuzzy
 msgid "Resolution:"
-msgstr "Opcije praga šuma:"
+msgstr "Резолуција:"
 
 #. TEXT_BATCH_LIST_BIT_DEPTH
-#, fuzzy
 msgid "Bit depth:"
-msgstr "Dubina bita ulazne game:"
+msgstr "Дубина бита:"
 
 #. TEXT_BATCH_LIST_BY_GUI
-#, fuzzy
 msgid "as selected"
-msgstr "Uvećavaj u izabrano područje"
+msgstr "као изабрано"
 
 #. TEXT_SETUP_PRINTER_SEL
 msgid "Printer selection:"
-msgstr "Izaberi štampač:"
+msgstr "Изабери штампач:"
 
 #. TEXT_SETUP_PRINTER_NAME
 msgid "Name:"
-msgstr "Ime:"
+msgstr "Име:"
 
 #. TEXT_SETUP_PRINTER_CMD, TEXT_SETUP_FAX_CMD
 #. TEXT_SETUP_FAX_COMMAND
 msgid "Command:"
-msgstr "Komanda:"
+msgstr "Команда:"
 
 #. TEXT_SETUP_COPY_NR_OPT
 msgid "Copy number option:"
-msgstr "Opcija sa broj kopija:"
+msgstr "Колико копија:"
+
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+msgid "Scan resolution:"
+msgstr "Резолуција скенирања:"
 
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
-msgstr "Rezolucija u crno/belom načinu Lineart (dpi):"
+msgid "lineart [dpi]"
+msgstr " (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
-msgstr "Rezolucija u sivom (dpi):"
+msgid "grayscale [dpi]"
+msgstr "Црно бела резолуција (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Rezolucija u boji (dpi):"
+msgid "color [dpi]"
+msgstr "боја [dpi]"
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr "Геометрија папира:"
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
-msgstr "Širina"
+msgid "width"
+msgstr "ширина"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
-msgstr "Visina"
+msgid "height"
+msgstr "висина"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
-msgstr "Leva ivica"
+msgid "left offset"
+msgstr "Лева ивица"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
-msgstr "Donja ivica"
+msgid "bottom offset"
+msgstr "Доња ивица"
+
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+msgid "Printer gamma:"
+msgstr "Штампач гама:"
 
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Vrednost gama za štampač:"
+msgid "common value"
+msgstr "заједничка вредност"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Vrednost gama crvene boje za štampač:"
+msgid "red"
+msgstr "црвена"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Vrednost gama zelene boje za štampač:"
+msgid "green"
+msgstr "зелена"
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Vrednost gama plave boje za štampač:"
+msgid "blue"
+msgstr "плава"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
-#, fuzzy
 msgid "Embed scanner ICM profile as CSA"
-msgstr "Odstrani štampač"
+msgstr "ICM профил од скенера угради као CSA"
 
 #. TEXT_SETUP_PRINTER_EMBED_CRD
-#, fuzzy
 msgid "Embed printer ICM profile as CRD"
-msgstr "Odstrani štampač"
+msgstr "ICM профил од скенера угради као CRD"
 
 #. TEXT_SETUP_PRINTER_CMS_BPC
 msgid "Apply black point compensation"
-msgstr ""
+msgstr "Примени компензацију црне тачке"
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
-msgstr ""
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
+msgstr "Направи zlib компресовану postcript слику (ps level 3) за штампање"
 
 #. TEXT_SETUP_TMP_PATH
 msgid "Temporary directory"
-msgstr "Privremeni direktorijum"
+msgstr "Привремени директоријум"
 
 #. TEXT_SETUP_IMAGE_PERMISSION
 msgid "Image-file permissions"
-msgstr "Dozvole za fajle slika"
+msgstr "Дозволе за фајле слика"
 
 #. TEXT_SETUP_DIR_PERMISSION
 msgid "Directory permissions"
-msgstr "Dozvole direktorijuma"
+msgstr "Дозволе директоријума"
 
 #. TEXT_SETUP_JPEG_QUALITY
 msgid "JPEG image quality"
-msgstr "JPEG kvalitet slike"
+msgstr "JPEG квалитет слике"
 
 #. TEXT_SETUP_PNG_COMPRESSION
 msgid "PNG image compression"
-msgstr "PNG kompresija slike"
+msgstr "PNG компресија слике"
 
 #. TEXT_SETUP_FILENAME_COUNTER_LEN
 msgid "Filename counter length"
-msgstr "Brojač dužine naziva fajla"
+msgstr "Бројач дужине назива фајле"
 
 #. TEXT_SETUP_TIFF_ZIP_COMPRESSION
-#, fuzzy
 msgid "TIFF zip compression rate"
-msgstr "TIFF 8 bitna kompresija slike"
+msgstr "TIFF zip фактор компресије"
 
 #. TEXT_SETUP_TIFF_COMPRESSION_16
 msgid "TIFF 16 bit image compression"
-msgstr "TIFF 16-bitna kompresija slike"
+msgstr "TIFF 16 битна компресија слике"
 
 #. TEXT_SETUP_TIFF_COMPRESSION_8
 msgid "TIFF 8 bit image compression"
-msgstr "TIFF 8 bitna kompresija slike"
+msgstr "TIFF 8 битна компресија слике"
 
 #. TEXT_SETUP_TIFF_COMPRESSION_1
 msgid "TIFF lineart image compression"
-msgstr "TIFF lineart kompresija slike"
+msgstr "TIFF lineart компресија слике"
 
 #. TEXT_SETUP_SHOW_RANGE_MODE
-#, fuzzy
 msgid "Show range as:"
-msgstr "Prikaži pregled"
+msgstr "Прикажи опсег као:"
 
 #. TEXT_SETUP_PREVIEW_OVERSAMPLING
 msgid "Preview oversampling:"
@@ -1020,218 +996,224 @@ msgstr "Prekomerni uzorak pri pregledu:"
 
 #. TEXT_SETUP_PREVIEW_GAMMA
 msgid "Preview gamma:"
-msgstr "Faktor gama pri pregledu:"
+msgstr "Фактор гама при прегледу:"
 
 #. TEXT_SETUP_PREVIEW_GAMMA_RED
 msgid "Preview gamma red:"
-msgstr "Faktor gama za crvenu boju pri pregledu:"
+msgstr "Фактор гама за црвену боју при прегледу:"
 
 #. TEXT_SETUP_PREVIEW_GAMMA_GREEN
 msgid "Preview gamma green:"
-msgstr "Faktor gama za zelenu boju pri pregledu:"
+msgstr "Фактор гама за зелену боју при прегледу:"
 
 #. TEXT_SETUP_PREVIEW_GAMMA_BLUE
 msgid "Preview gamma blue:"
-msgstr "Faktor gama za plavu boja pri pregledu:"
+msgstr "Фактор гама за плаву боју при прегледу:"
 
 #. TEXT_SETUP_LINEART_MODE
 msgid "Threshold option:"
-msgstr "Opcije praga šuma:"
+msgstr "Опције прага шума:"
 
 #. TEXT_SETUP_PREVIEW_PIPETTE_RANGE
 msgid "Preview pipette range"
-msgstr "Opsega četkice pri pregledu"
+msgstr "Опсег четкице при прегледу"
 
 #. TEXT_SETUP_THRESHOLD_MIN
 msgid "Threshold minimum:"
-msgstr "Minimalni prag šuma:"
+msgstr "Минимални прег шума:"
 
 #. TEXT_SETUP_THRESHOLD_MAX
 msgid "Threshold maximum:"
-msgstr "Maksimum praga šuma:"
+msgstr "Максимум прага шума:"
 
 #. TEXT_SETUP_THRESHOLD_MUL
 msgid "Threshold multiplier:"
-msgstr "Umnožavač praga šuma:"
+msgstr "Умножаваћ прага шума:"
 
 #. TEXT_SETUP_THRESHOLD_OFF
 msgid "Threshold offset:"
-msgstr "Promena praga šuma:"
+msgstr "Промена прага шума:"
 
 #. TEXT_SETUP_GRAYSCALE_SCANMODE
 msgid "Name of grayscale scanmode:"
-msgstr "Ime sivog načina skeniranja:"
+msgstr "Име сивог начина скенирања:"
 
 #. TEXT_SETUP_HELPFILE_VIEWER
 msgid "Helpfile viewer (HTML):"
-msgstr "Prikazivač za pomoć (HTML):"
+msgstr "Приказивач за помоћ (HTML):"
 
 #. TEXT_SETUP_FAX_RECEIVER_OPTION
 msgid "Receiver option:"
-msgstr "Opcija za broj prijemnika:"
+msgstr "Опција за број пријемника:"
 
 #. TEXT_SETUP_FAX_POSTSCRIPT_OPT
 msgid "Postscriptfile option:"
-msgstr "Opcije za postscript fajl:"
+msgstr "Опција за postscript фајлу:"
 
 #. TEXT_SETUP_FAX_NORMAL_MODE_OPT
 msgid "Normal mode option:"
-msgstr "Opcije pri normalnom načinu:"
+msgstr "Опције при уобичајеном начину:"
 
 #. TEXT_SETUP_FAX_FINE_MODE_OPT
 msgid "Fine mode option:"
-msgstr "Opcije pri posebnom načinu:"
+msgstr "Опције y finom начину:"
 
 #. TEXT_SETUP_FAX_PROGRAM_DEFAULTS
 msgid "Set program defaults for:"
-msgstr ""
+msgstr "Стави стандардне вредности за програм:"
 
 #. TEXT_SETUP_FAX_VIEWER
 msgid "Viewer (Postscript):"
-msgstr "Prikazivač (postscript):"
+msgstr "Приказивач (postscript):"
+
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Ширина"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Висина"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Лева ивица"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Доња ивица"
 
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
-msgstr ""
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
+msgstr "Направи zlib компресовану postscript слику (PS level 3) за факс"
 
 #. TEXT_SETUP_SMTP_SERVER
 msgid "SMTP server:"
-msgstr "SMTP server"
+msgstr "SMTP сервер:"
 
 #. TEXT_SETUP_SMTP_PORT
 msgid "SMTP port:"
-msgstr "SMTP port:"
+msgstr "SMTP порт:"
 
 #. TEXT_SETUP_EMAIL_FROM
 msgid "From:"
-msgstr "Pošiljalac:"
+msgstr "Пошиљалац:"
 
 #. TEXT_SETUP_EMAIL_REPLY_TO
 msgid "Reply to:"
-msgstr "Adresa za odgovor:"
+msgstr "Одговор на:"
 
 #. TEXT_SETUP_EMAIL_AUTHENTICATION
-#, fuzzy
 msgid "E-mail authentication"
-msgstr "POP3 autentifikacija"
+msgstr "Ауторизација е-поште"
 
 #. TEXT_SETUP_EMAIL_AUTH_USER
-#, fuzzy
 msgid "User:"
-msgstr "Upotreba:"
+msgstr "Корисник:"
 
 #. TEXT_SETUP_EMAIL_AUTH_PASS
-#, fuzzy
 msgid "Password:"
-msgstr "Lozinka:"
+msgstr "Лозинка:"
 
 #. TEXT_SETUP_POP3_SERVER
 msgid "POP3 server:"
-msgstr "POP3 server:"
+msgstr "POP3 сервер:"
 
 #. TEXT_SETUP_POP3_PORT
 msgid "POP3 port:"
-msgstr "POP3 port:"
+msgstr "POP3 порт:"
 
 #. TEXT_SETUP_OCR_COMMAND
 msgid "OCR Command:"
-msgstr "OCR komanda:"
+msgstr "OCR команда:"
 
 #. TEXT_SETUP_OCR_INPUTFILE_OPT
 msgid "Inputfile option:"
-msgstr "Opcije za ulazni fajl:"
+msgstr "Опције за улазну фајлу:"
 
 #. TEXT_SETUP_OCR_OUTPUTFILE_OPT
 msgid "Outputfile option:"
-msgstr "Opcije za izlazni fajl:"
+msgstr "Опције за излазну фајлу:"
 
 #. TEXT_SETUP_OCR_USE_GUI_PIPE_OPT
 msgid "Use GUI progress pipe:"
-msgstr ""
+msgstr "Користи напредак GUI цеви:"
 
 #. TEXT_SETUP_OCR_OUTFD_OPT
-#, fuzzy
 msgid "GUI output-fd option:"
-msgstr "Opcije za izlazni fajl:"
+msgstr "GUI -fd излазна опција:"
 
 #. TEXT_SETUP_OCR_PROGRESS_KEYWORD
 msgid "Progress keyword:"
-msgstr ""
+msgstr "Кључна реч напретка:"
 
 #. TEXT_SETUP_PERMISSION_USER
 msgid "user"
-msgstr "korisnik"
+msgstr "корисник"
 
 #. TEXT_SETUP_PERMISSION_GROUP
 msgid "group"
-msgstr "grupa"
+msgstr "група"
 
 #. TEXT_SETUP_PERMISSION_ALL
 msgid "all"
-msgstr "svi"
+msgstr "сви"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_COLOR_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_COLOR_ICM_PROFILE
-#, fuzzy
 msgid "Scanner default color ICM-profile"
-msgstr "Odstrani štampač"
+msgstr "Уобичајени ICM профил за боју од скенера"
 
 #. TEXT_SETUP_SCANNER_DEFAULT_GRAY_ICM_PROFILE
 #. DESC_SCANNER_DEFAULT_GRAY_ICM_PROFILE
-#, fuzzy
 msgid "Scanner default gray ICM-profile"
-msgstr "Odstrani štampač"
+msgstr "Уобичајени ICM профил за сиво од скенера"
 
 #. TEXT_SETUP_DISPLAY_ICM_PROFILE
 #. DESC_DISPLAY_ICM_PROFILE
 msgid "Display ICM-profile"
-msgstr ""
+msgstr "ICM профил за екран"
 
 #. TEXT_SETUP_CUSTOM_PROOFING_ICM_PROFILE
 #. DESC_CUSTOM_PROOFING_ICM_PROFILE
-#, fuzzy
 msgid "Custom proofing ICM-profile"
-msgstr "Odstrani štampač"
+msgstr "Избор корисника за пробни ICM профил"
 
 #. TEXT_SETUP_WORKING_COLOR_SPACE_ICM_PROFILE
 #. DESC_WORKING_COLOR_SPACE_ICM_PROFILE
-#, fuzzy
 msgid "Working color space ICM-profile"
-msgstr "Traži slike po nazivima fajla"
+msgstr "Радни простор ICM профила у боји"
 
 #. TEXT_SETUP_PRINTER_ICM_PROFILE
 #. DESC_PRINTER_ICM_PROFILE
 msgid "Printer ICM-profile"
-msgstr ""
+msgstr "ICM профил штампача"
 
 msgid "new media"
-msgstr ""
+msgstr "нови уређај"
 
 #. NOTEBOOK_SAVING_OPTIONS
 #. MENU_ITEM_SAVE
 msgid "Save"
-msgstr "Sačuvaj"
+msgstr "Сачувај"
 
 #. NOTEBOOK_FILETYPE_OPTIONS
-#, fuzzy
 msgid "Filetype"
-msgstr "Fajl"
+msgstr "Тип фајле"
 
 #. NOTEBOOK_COPY_OPTIONS
 #. MENU_ITEM_COPY
 msgid "Copy"
-msgstr "Kopiraj"
+msgstr "Копирај"
 
 #. NOTEBOOK_FAX_OPTIONS
 #. MENU_ITEM_FAX
 msgid "Fax"
-msgstr "Faks"
+msgstr "Факс"
 
 #. NOTEBOOK_EMAIL_OPTIONS
 #. MENU_ITEM_EMAIL
-#, fuzzy
 msgid "E-mail"
-msgstr "E-pošta:"
+msgstr "Е-пошта:"
 
 #. NOTEBOOK_OCR_OPTIONS
 msgid "OCR"
@@ -1239,643 +1221,613 @@ msgstr "OCR"
 
 #. NOTEBOOK_DISPLAY_OPTIONS
 msgid "Display"
-msgstr "Prikaz"
+msgstr "Екран"
 
 #. NOTEBOOK_ENHANCE_OPTIONS
 msgid "Enhancement"
-msgstr "Poboljšavanje"
+msgstr "Побољшавање"
 
 #. MENU_ITEM_MULTIPAGE
 msgid "Multipage"
-msgstr ""
+msgstr "Многоструко"
 
 #. MENU_ITEM_SHOW_TOOLTIPS
 msgid "Show tooltips"
-msgstr "Prikaži savete"
+msgstr "Прикажи савете"
 
 #. MENU_ITEM_SHOW_PREVIEW
 msgid "Show preview"
-msgstr "Prikaži pregled"
+msgstr "Прикажи преглед"
 
 #. MENU_ITEM_SHOW_HISTOGRAM
 msgid "Show histogram"
-msgstr "Prikaži histogram"
+msgstr "Прикажи хистограм"
 
 #. MENU_ITEM_SHOW_GAMMA
 msgid "Show gamma curve"
-msgstr "Prikaži krivinu gama"
+msgstr "Прикажи кривину гама"
 
 #. MENU_ITEM_SHOW_BATCH_SCAN
-#, fuzzy
 msgid "Show batch scan"
-msgstr "paketno skeniranje"
+msgstr "Прикажи пакетно скенирање"
 
 #. MENU_ITEM_SHOW_STANDARDOPTIONS
 msgid "Show standard options"
-msgstr "Prikaži standardne izbore"
+msgstr "Прикажи стандардне изборе"
 
 #. MENU_ITEM_SHOW_ADVANCEDOPTIONS
 msgid "Show advanced options"
-msgstr "Prikaži napredne mogućnosti"
+msgstr "Прикажи напредне могућности"
 
 #. MENU_ITEM_SETUP
 msgid "Setup"
-msgstr "Konfiguracija"
+msgstr "Конфигурација"
 
 #. MENU_ITEM_LENGTH_UNIT
 msgid "Length unit"
-msgstr "Dužinska mera"
+msgstr "Дужинска мера"
 
 #. SUBMENU_ITEM_LENGTH_MILLIMETERS
 msgid "millimeters"
-msgstr "milimetri"
+msgstr "милиметри"
 
 #. SUBMENU_ITEM_LENGTH_CENTIMETERS
 msgid "centimeters"
-msgstr "centimetri"
+msgstr "сантиметри"
 
 #. SUBMENU_ITEM_LENGTH_INCHES
 msgid "inches"
-msgstr "inči"
+msgstr "инчи"
 
 #. MENU_ITEM_UPDATE_POLICY
 msgid "Update policy"
-msgstr "Aktualiziraj"
+msgstr "Начин освежавања"
 
 #. SUBMENU_ITEM_POLICY_CONTINUOUS
 msgid "continuous"
-msgstr "neprekidno"
+msgstr "непрекидно"
 
 #. SUBMENU_ITEM_POLICY_DISCONTINU
 msgid "discontinuous"
-msgstr "prekidno"
+msgstr "прекидно"
 
 #. SUBMENU_ITEM_POLICY_DELAYED
 msgid "delayed"
-msgstr "zadržano"
+msgstr "одложено"
 
 #. MENU_ITEM_SHOW_RESOLUTIONLIST
 msgid "Show resolution list"
-msgstr "Prikaži listu rezolucija"
+msgstr "Прикажи листу резолуција"
 
 #. MENU_ITEM_PAGE_ROTATE
 msgid "Rotate postscript"
-msgstr "Rotiraj postscript"
+msgstr "Обрни postscript"
 
 #. MENU_ITEM_ENABLE_COLOR_MANAGEMENT
 #. MENU_ITEM_CMS_ENABLE_COLOR_MANAGEMENT
-#, fuzzy
 msgid "Enable color management"
-msgstr "pun opseg"
+msgstr "Укључи подешавања боје"
 
 #. MENU_ITEM_EDIT_MEDIUM_DEF
-#, fuzzy
 msgid "Edit medium definition"
-msgstr "Preimenuj definiciju"
+msgstr "Prомени дефиницију уређаја"
 
 #. MENU_ITEM_SAVE_DEVICE_SETTINGS
 msgid "Save device settings"
-msgstr "Zapamti podešavanja uređaja"
+msgstr "Запамти подешавања уређаја"
 
 #. MENU_ITEM_LOAD_DEVICE_SETTINGS
 msgid "Load device settings"
-msgstr "Učitaj podešavanja uređaja"
+msgstr "Учитарј подешавања уређаја"
 
 #. MENU_ITEM_CHANGE_WORKING_DIR
 msgid "Change directory"
-msgstr "Promeni direktorijum"
+msgstr "Промени директоријум"
 
 #. MENU_ITEM_XSANE_EULA
 msgid "Show EULA"
-msgstr ""
+msgstr "Прикажи EULA"
 
 #. MENU_ITEM_XSANE_GPL
 msgid "Show license (GPL)"
-msgstr ""
+msgstr "Прикажи лиценцу (GPL)"
 
 #. MENU_ITEM_XSANE_DOC
 msgid "XSane doc"
-msgstr "Xsane dokumentacija"
+msgstr "XSane документација"
 
 #. MENU_ITEM_BACKEND_DOC
 msgid "Backend doc"
-msgstr "Backend dokumentacija"
+msgstr "Документација додатка"
 
 #. MENU_ITEM_AVAILABLE_BACKENDS
 msgid "Available backends"
-msgstr "Dostupni backend-i"
+msgstr "Доступни додатци"
 
 #. MENU_ITEM_SCANTIPS
 msgid "Scantips"
-msgstr "Saveti za skeniranje"
+msgstr "Савети за скенирање"
 
 #. MENU_ITEM_PROBLEMS
 msgid "Problems?"
-msgstr "Problemi?"
+msgstr "Проблеми?"
 
 #. MENU_ITEM_CMS_PROOFING
-#, fuzzy
 msgid "Proofing"
-msgstr "Dodaj štampač"
+msgstr "Проба"
 
 #. SUBMENU_ITEM_CMS_PROOF_OFF
 msgid "no proofing (Display)"
-msgstr ""
+msgstr "нема probe (Екран)"
 
 #. SUBMENU_ITEM_CMS_PROOF_PRINTER
-#, fuzzy
 msgid "Proof printer"
-msgstr "Dodaj štampač"
+msgstr "Пробни штампач"
 
 #. SUBMENU_ITEM_CMS_PROOF_CUSTOM
 msgid "Proof custom device"
 msgstr ""
 
 #. MENU_ITEM_CMS_RENDERING_INTENT
-#, fuzzy
 msgid "Rendering intent"
-msgstr "Dodaj štampač"
+msgstr ""
 
 #. MENU_ITEM_CMS_PROOFING_INTENT
-#, fuzzy
 msgid "Proofing rendering intent"
-msgstr "Dodaj štampač"
+msgstr "Пробни "
 
 #. SUBMENU_ITEM_CMS_INTENT_PERCEPTUAL
 msgid "Perceptual"
-msgstr ""
+msgstr "Предмет опажања"
 
 #. SUBMENU_ITEM_CMS_INTENT_RELATIVE_COLORIMETRIC
 msgid "Relative colorimetric"
-msgstr ""
+msgstr "одмерено мешане боје"
 
 #. SUBMENU_ITEM_CMS_INTENT_ABSOLUTE_COLORIMETRIC
 msgid "Absolute colorimentric"
 msgstr ""
 
 #. SUBMENU_ITEM_CMS_INTENT_SATURATION
-#, fuzzy
 msgid "Saturation"
-msgstr "autorizacija"
+msgstr "Засићење"
 
 #. MENU_ITEM_CMS_GAMUT_CHECK
 msgid "Gamut check"
-msgstr ""
+msgstr "Gamut провера"
 
 #. MENU_ITEM_CMS_GAMUT_ALARM_COLOR
 msgid "Gamut alarm color"
-msgstr ""
+msgstr "Gamut алармна боја"
 
 #. SUBMENU_ITEM_CMS_COLOR_BLACK
 msgid "Black"
-msgstr ""
+msgstr "Црно"
 
 #. SUBMENU_ITEM_CMS_COLOR_GRAY
 msgid "Gray"
-msgstr ""
+msgstr "Сиво"
 
 #. SUBMENU_ITEM_CMS_COLOR_WHITE
-#, fuzzy
 msgid "White"
-msgstr "pisati"
+msgstr "Бела"
 
 #. SUBMENU_ITEM_CMS_COLOR_RED
-#, fuzzy
 msgid "Red"
-msgstr "Smanji"
+msgstr "Црвена"
 
 #. SUBMENU_ITEM_CMS_COLOR_GREEN
 msgid "Green"
-msgstr ""
+msgstr "Зелена"
 
 #. SUBMENU_ITEM_CMS_COLOR_BLUE
-#, fuzzy
 msgid "Blue"
-msgstr "zamagli"
+msgstr "Плава"
 
 #. MENU_ITEM_COUNTER_LEN_INACTIVE
 msgid "inactive"
-msgstr "neaktivno"
+msgstr "неактивно"
 
 #. MENU_ITEM_TIFF_COMP_NONE
 msgid "no compression"
-msgstr "bez kompresije"
+msgstr "без компресије"
 
 #. MENU_ITEM_TIFF_COMP_CCITTRLE
 msgid "CCITT 1D Huffman compression"
-msgstr "CCITT 1D Huffman kompresija"
+msgstr "CCITT 1D Huffman компресија"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
-msgstr "CCITT Group 3 Faks kompresija"
+msgid "CCITT Group 3 fax compression"
+msgstr "CCITT Group 3 факс компресија"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
-msgstr "CCITT Group 4 Faks kompresija"
+msgid "CCITT Group 4 fax compression"
+msgstr "CCITT Group 4 факс компресија"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
 msgid "JPEG DCT compression"
-msgstr "JPEG DCT kompresija"
+msgstr "JPEG DCT компресија"
 
 #. MENU_ITEM_TIFF_COMP_PACKBITS
 msgid "pack bits"
-msgstr "zapakovani biti"
+msgstr "запаковани бити"
 
 #. MENU_ITEM_TIFF_COMP_DEFLATE
-#, fuzzy
 msgid "deflate"
-msgstr "zadržano"
+msgstr "запаковати"
 
 #. MENU_ITEM_RANGE_SCALE
-#, fuzzy
 msgid "Slider (Scale)"
-msgstr "Dia"
+msgstr "Клизач (Скала)"
 
 #. MENU_ITEM_RANGE_SCROLLBAR
 msgid "Slider (Scrollbar)"
-msgstr ""
+msgstr "Клизач (клизећа трака)"
 
 #. MENU_ITEM_RANGE_SPINBUTTON
 msgid "Spinbutton"
-msgstr ""
+msgstr "Дугме за окретање"
 
 #. MENU_ITEM_RANGE_SCALE_SPIN
 msgid "Scale and Spinbutton"
-msgstr ""
+msgstr "Клизач и дугме за окретање"
 
 #. MENU_ITEM_RANGE_SCROLL_SPIN
 msgid "Scrollbar and Spinbutton"
-msgstr ""
+msgstr "Клизећа трака и дугме за окретање"
 
 #. MENU_ITEM_LINEART_MODE_STANDARD
 msgid "Standard options window (lineart)"
-msgstr "Standardne opcije prozor (c/b)"
+msgstr "Стандардне опције прозор (linerart)"
 
 #. MENU_ITEM_LINEART_MODE_XSANE
 msgid "XSane main window (lineart)"
-msgstr "Xane glavni prozor (c/b)"
+msgstr "XSane главни прозор (lineart)"
 
 #. MENU_ITEM_LINEART_MODE_GRAY
 msgid "XSane main window (grayscale->lineart)"
-msgstr "XSane glavni prozor (sivi -> c/b)"
+msgstr "XSane главни прозор (crno-belo -> linerart)"
 
 #. MENU_ITEM_SELECTION_NONE
 msgid "(none)"
-msgstr "(ništa)"
+msgstr "(ништа)"
 
 #. MENU_ITEM_FILETYPE_BY_EXT
 msgid "by ext"
-msgstr "po nastavku"
+msgstr "по наставку"
 
 #. MENU_ITEM_PRESET_AREA_ADD_SEL
 msgid "Add selection to list"
-msgstr "Dodaj izbor u listu"
+msgstr "Додај избор у листу"
 
 #. MENU_ITEM_MEDIUM_ADD
-#, fuzzy
 msgid "Add medium definition"
-msgstr "Preimenuj definiciju"
+msgstr "Додај дефиницију уређаја"
 
 #. MENU_ITEM_RENAME
-#, fuzzy
 msgid "Rename item"
-msgstr "Preimenuj sliku"
+msgstr "Преименуј ставку"
 
 #. MENU_ITEM_DELETE
-#, fuzzy
 msgid "Delete item"
-msgstr "Odstrani štampač"
+msgstr "Одстрани ставку"
 
 #. MENU_ITEM_MOVE_UP
-#, fuzzy
 msgid "Move item up"
-msgstr "Pomeri na gore"
+msgstr "Помери ставку на горе"
 
 #. MENU_ITEM_MOVE_DWN
-#, fuzzy
 msgid "Move item down"
-msgstr "Pomeri na dole"
+msgstr "Помери ставку на доле"
 
 #. MENU_ITEM_AUTH_NONE
-#, fuzzy
 msgid "no authentication"
-msgstr "POP3 autentifikacija"
+msgstr "нема ауторизације"
 
 #. MENU_ITEM_AUTH_POP3
 msgid "POP3 before SMTP"
-msgstr ""
+msgstr "POP3 пре SMTP"
 
 #. MENU_ITEM_AUTH_ASMTP_PLAIN
 msgid "ASMTP Plain"
-msgstr ""
+msgstr "ASMTP отворен"
 
 #. MENU_ITEM_AUTH_ASMTP_LOGIN
 msgid "ASMTP Login"
-msgstr ""
+msgstr "ASMTP пријава"
 
 #. MENU_ITEM_AUTH_ASMTP_CRAM_MD5
 msgid "ASMTP CRAM-MD5"
-msgstr ""
+msgstr "ASMTP CRAM-MD5"
 
 #. MENU_ITEM_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE
-#, fuzzy
 msgid "Embed scanner ICM profile"
-msgstr "Odstrani štampač"
+msgstr "Уградити скенеров ICM профил"
 
 #. MENU_ITEM_CMS_FUNCTION_CONVERT_TO_SRGB
 msgid "Convert to sRGB"
-msgstr ""
+msgstr "Претвори у sRGB"
 
 #. MENU_ITEM_FUNCTION_CONVERT_TO_WORKING_CS
-#, fuzzy
 msgid "Convert to working color space"
-msgstr "Autokorektura boja"
+msgstr "Промени у "
 
 #. PROGRESS_SCANNING
 msgid "Scanning"
-msgstr "Skeniranje"
+msgstr "Скенирање"
 
 #. PROGRESS_RECEIVING_FRAME_DATA
 #, c-format
 msgid "Receiving %s data"
-msgstr "Primam %s podatke"
+msgstr "Примам %s податке"
 
 #. PROGRESS_PAGE
-#, fuzzy
 msgid "page"
-msgstr "paket"
+msgstr "страна"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
-msgstr "Sliku preneti"
+#. PROGRESS_TRANSFERRING_DATA
+msgid "Transferring image"
+msgstr "Пренети слику"
 
 #. PROGRESS_ROTATING_DATA
 msgid "Rotating image"
-msgstr "Sliku rotirati"
+msgstr "Слику ротирати"
 
 #. PROGRESS_MIRRORING_DATA
 msgid "Mirroring image"
-msgstr "Sliku ogledati"
+msgstr "Слику огледати"
 
 #. PROGRESS_PACKING_DATA
 msgid "Packing image"
-msgstr "Sliku kompresovati"
+msgstr "Слику компресовати"
 
 #. PROGRESS_CONVERTING_DATA
 msgid "Converting image"
-msgstr "Podatke konvertovati"
+msgstr "Податке конвертовати"
 
 #. PROGRESS_SAVING_DATA
 msgid "Saving image"
-msgstr "Sliku zapamtiti"
+msgstr "Слику запамтити"
 
 #. PROGRESS_CLONING_DATA
 msgid "Cloning image"
-msgstr "Sliku kopirati"
+msgstr "Слику копирати"
 
 #. PROGRESS_SCALING_DATA
 msgid "Scaling image"
-msgstr "Skaliraj sliku"
+msgstr "Скалирај слику"
 
 #. PROGRESS_DESPECKLING_DATA
 msgid "Despeckling image"
-msgstr "Sliku odflekavati"
+msgstr "Слику одфлекати"
 
 #. PROGRESS_BLURING_DATA
 msgid "Bluring image"
-msgstr "Zamagljavam sliku"
+msgstr "Замагљујем слику"
 
 #. PROGRESS_OCR
 msgid "OCR in progress"
-msgstr ""
+msgstr "OCR напредак"
 
 #. PROGRESS_ICM_CONVERSION
-#, fuzzy
 msgid "converting colors"
-msgstr "Autokorektura boja"
+msgstr "Промени боје"
 
 #. DESC_SCAN_START
 msgid "Start scan <Ctrl-Enter>"
-msgstr "Startaj skeniranje <Ctrl-Enter>"
+msgstr "Стартај скенирање <Ctrl-Enter>"
 
 #. DESC_SCAN_CANCEL
 msgid "Cancel scan <ESC>"
-msgstr "Prekini skeniranje <ESC>"
+msgstr "Прекини скенирање <ESC>"
 
 #. DESC_PREVIEW_ACQUIRE
 msgid "Acquire preview scan <Alt-p>"
-msgstr "Pregled <Alt-p>"
+msgstr "Преглед <Alt-p>"
 
 #. DESC_PREVIEW_CANCEL
 msgid "Cancel preview scan <Alt-ESC>"
-msgstr "Prekini pregled <Alt-ESC>"
+msgstr "Прекини преглед <Alt-ESC>"
 
 #. DESC_XSANE_MODE
 msgid ""
 "viewer-<Ctrl-v>, save-<Ctrl-s>, photocopy-<Ctrl-c>, multipage-<Ctrl-m>, fax-"
 "<Ctrl-f> or e-mail-<Ctrl-e>"
 msgstr ""
+"прикажи-<Ctrl-v>, запамти-<Ctrl-s>, фотокопија-<Ctrl-c>, многоструки-<Ctrl-"
+"m>, факс-<Ctrl-f> или е-пошта-<Ctrl-e>"
 
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
 msgstr ""
+"Изабери изворни уређај.\n"
+"За преименовање, сортирање или брисање уписа користити контексни мени\n"
+" (алтернативни тастер миша).\n"
+"Да би направили нови уређај, опцију промени дефиницију уређаја у "
+"подешавањима активирати."
 
 #. DESC_FILENAME_COUNTER_STEP
 msgid "Value that is added to filenamecounter after scan"
-msgstr "Vrednost, za koju se povećava brojač fajla posle skeniranja"
+msgstr "Вредност, за коју се повећава бројач фајле после скенирања"
 
 #. DESC_BROWSE_FILENAME
 msgid "Browse for image filename"
-msgstr "Traži slike po nazivima fajla"
+msgstr "Тражи слике по називима фајла"
 
 #. DESC_FILENAME
 msgid "Filename for scanned image"
-msgstr "Naziv fajla za skeniranu sliku"
+msgstr "Назив фајла за скенирану слику"
 
 #. DESC_FILETYPE
 msgid ""
 "Type of image format, the suitable filename extension is automatically added "
 "to the filename"
 msgstr ""
-"Način zapisa; odgovarajući nastavak se automatski dodaje na naziv fajla"
+"Тип формата записа слике, одговарајући наставак се аутоматски додаје на "
+"назив фајле"
 
 #. DESC_FAXPROJECT
-#, fuzzy
 msgid "Enter fax project directory name"
-msgstr "Pretraži privremeni direktorijum"
+msgstr "Наведи директоријум за факс пројект"
 
 #. DESC_FAXPAGENAME
 msgid "Enter new name for faxpage"
-msgstr "Unesi novo ime za stranu sa faksom"
+msgstr "Унеси ново име за страну са факсом"
 
 #. DESC_FAXRECEIVER
 msgid "Enter receiver phone number or address"
-msgstr "Unesi telefonski broj ili adresu prijemnika"
+msgstr "Унеси телефонски број или адресу пријемника"
 
 #. DESC_FAX_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for fax project directory"
-msgstr "Pretraži privremeni direktorijum"
+msgstr "Тражи директориј за факс пројект"
 
 #. DESC_EMAIL_PROJECT
-#, fuzzy
 msgid "Enter e-mail project directory name"
-msgstr "Pretraži privremeni direktorijum"
+msgstr "Наведи директоријум за пројект е-поште"
 
 #. DESC_EMAIL_IMAGENAME
-#, fuzzy
 msgid "Enter new name for e-mail image"
-msgstr "Unesi novo ime za sliku u E-pošti"
+msgstr "Унеси ново име за слику у е-пошти"
 
 #. DESC_EMAIL_RECEIVER
-#, fuzzy
 msgid "Enter e-mail address"
-msgstr "Unesi email adresu"
+msgstr "Унеси адресу е-поште"
 
 #. DESC_EMAIL_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for email project directory"
-msgstr "Pretraži privremeni direktorijum"
+msgstr "Претражи директоријум за пројект е-поште"
 
 #. DESC_EMAIL_SUBJECT
-#, fuzzy
 msgid "Enter subject of e-mail"
-msgstr "Unesi temu od E-pošte"
+msgstr "Унеси тему од е-поште"
 
 #. DESC_EMAIL_FILETYPE
 msgid "Select filetype for image attachments"
-msgstr ""
+msgstr "Изабери тип фајле за сликовне додатке"
 
 #. DESC_MULTIPAGE_PROJECT
-#, fuzzy
 msgid "Enter multipage project directory name"
-msgstr "Pretraži privremeni direktorijum"
+msgstr "Наведи директоријум за многоструки пројект"
 
 #. DESC_MULTIPAGE_PROJECT_BROWSE
-#, fuzzy
 msgid "Browse for multipage project directory"
-msgstr "Pretraži privremeni direktorijum"
+msgstr "Претражи директоријум за многоструки пројект"
 
 #. DESC_MULTIPAGE_FILETYPE
-#, fuzzy
 msgid "Select filetype for multipage file"
-msgstr "Izaberi izlazni naziv fajla za OCR tekst fajl"
+msgstr "Изабери тип фајле за многоструку фајлу"
 
 #. DESC_PRESET_AREA_RENAME
 msgid "Enter new name for preset area"
-msgstr "Unesi novo ime za opseg konfiguracija"
+msgstr "Унеси ново име за опсег конфигурација"
 
 #. DESC_PRESET_AREA_ADD
-#, fuzzy
 msgid "Enter name for new preset area"
-msgstr "Unesi novo ime za opseg konfiguracija"
+msgstr "Унеси име за нови опсег конфигурација"
 
 #. DESC_MEDIUM_RENAME
-#, fuzzy
 msgid "Enter new name for medium definition"
-msgstr "Preimenuj definiciju"
+msgstr "Унеси ново име за дефиницију уређаја"
 
 #. DESC_MEDIUM_ADD
-#, fuzzy
 msgid "Enter name for new medium definition"
-msgstr "Preimenuj definiciju"
+msgstr "Унеси име за нову дефиницију уређаја"
 
 #. DESC_PRINTER_SELECT
 msgid "Select printerdefinition <Shift-F1/F2/...>"
-msgstr "Izaberi štampač"
+msgstr "Изабери дефиницију штампача <Shift-F1/F2/...>"
 
 #. DESC_RESOLUTION
 msgid "Set scan resolution"
-msgstr "Izaberi rezoluciju skeniranja"
+msgstr "Изабери резолуцију скенирања"
 
 #. DESC_RESOLUTION_X
 msgid "Set scan resolution for x direction"
-msgstr "Izaberi rezoluciju skeniranja u smeru x"
+msgstr "Изабери резолуцију скенирања у смеру x"
 
 #. DESC_RESOLUTION_Y
 msgid "Set scan resolution for y direction"
-msgstr "Izaberi rezoluciju skeniranja u smeru y"
+msgstr "Изабери резолуцију скенирања у смеру y"
 
 #. DESC_ZOOM
 msgid "Set zoomfactor"
-msgstr "Izaberi faktor uveli"
+msgstr "Изабери фактор увеличавања"
 
 #. DESC_ZOOM_X
 msgid "Set zoomfactor for x direction"
-msgstr "Izaberi faktor uveli u smeru x"
+msgstr "Изабери фактор увеличавања у смеру x"
 
 #. DESC_ZOOM_Y
 msgid "Set zoomfactor for y direction"
-msgstr "Izaberi faktor uveličavanja u smeru y"
+msgstr " Изабери фактор увеличавања у смеру y"
 
 #. DESC_COPY_NUMBER
 msgid "Set number of copies"
-msgstr "Izaberite broj kopija"
+msgstr "Одредите број копија"
 
 #. DESC_NEGATIVE
-#, fuzzy
 msgid "Negative: Invert colors for scanning negatives <Ctrl-n>"
-msgstr "Negativ: invertiraj boje za skeniranje negativa <Shift-n>"
+msgstr "Негатив: Преокрени боје за скенирање негатива <Ctrl-n>"
 
 #. DESC_GAMMA
 msgid "Set gamma value"
-msgstr "Izaberi vrednost gama"
+msgstr "Изабери вредност гама"
 
 #. DESC_GAMMA_R
 msgid "Set gamma value for red component"
-msgstr "Izaberi vrednost gama za crvenu boju"
+msgstr "Изабери вредност гама за црвену компонетну"
 
 #. DESC_GAMMA_G
 msgid "Set gamma value for green component"
-msgstr "Izaberi vrednost gama za zelenu boju"
+msgstr "Изабери вредност гама за зелену компонетну"
 
 #. DESC_GAMMA_B
 msgid "Set gamma value for blue component"
-msgstr "Izaberi vrednost gama za plavu boju"
+msgstr "Изабери вредност гама за плаву компонетну"
 
 #. DESC_BRIGHTNESS
 msgid "Set brightness"
-msgstr "Izaberi osvetljenje"
+msgstr "Изабери осветљење"
 
 #. DESC_BRIGHTNESS_R
 msgid "Set brightness for red component"
-msgstr "Izaberi osvetljenje za crvenu boju"
+msgstr "Изабери осветљење за црвену компоненту"
 
 #. DESC_BRIGHTNESS_G
 msgid "Set brightness for green component"
-msgstr "Izaberi osvetljenje za zelenu boju"
+msgstr "Изабери осветљење за зелену компоненту"
 
 #. DESC_BRIGHTNESS_B
 msgid "Set brightness for blue component"
-msgstr "Izaberi osvetljenje za plavu boju"
+msgstr "Изабери осветљење за плаву компоненту"
 
 #. DESC_CONTRAST
 msgid "Set contrast"
-msgstr "Izaberi kontrast"
+msgstr "Изабери контраст"
 
 #. DESC_CONTRAST_R
 msgid "Set contrast for red component"
-msgstr "Izaberi kontrast za crvenu boju"
+msgstr "Изабери контраст за црвену компоненту"
 
 #. DESC_CONTRAST_G
 msgid "Set contrast for green component"
-msgstr "Izaberi kontrast za zelenu boju"
+msgstr "Изабери контраст за зелену компоненту"
 
 #. DESC_CONTRAST_B
 msgid "Set contrast for blue component"
-msgstr "Izaberi kontrast za plavu boju"
+msgstr "Изабери контраст за плаву компоненту"
 
 #. DESC_THRESHOLD
 msgid "Set threshold"
-msgstr "Izaberi prag šuma"
+msgstr "Изабери праг шума"
 
 #. DESC_RGB_DEFAULT
-#, fuzzy
 msgid ""
 "RGB default: Set enhancement values for red, green and blue to default "
 "values <Ctrl-b>:\n"
@@ -1883,688 +1835,673 @@ msgid ""
 " brightness = 0\n"
 " contrast = 0"
 msgstr ""
-"Podrazumevane vrednosti za RGB: Namesti poboljšane vrednosti za crvenu, "
-"zelenu i plavu na standardne vrednosti <Shift-b>:\n"
-" gama = 1.0\n"
-" svetlost = 0\n"
-" kontrast = 0"
+"Подразумеване вредности за RGB:\n"
+"Намести побољшане вредности за црвену, зелену и плаву настандардне вредности "
+"<Ctrl-b>:\n"
+" гама = 1.0\n"
+" осветљење = 0\n"
+" контраст = 0"
 
 #. DESC_ENH_AUTO
-#, fuzzy
 msgid "Autoadjust gamma, brightness and contrast <Ctrl-a>"
-msgstr "Autopodešavanje  vrednosti gama, osvetljenja i kontrasta <Shift-e>"
+msgstr "Аутоподешавање вредности гама, осветљења и контраста <Ctrl-a>"
 
 #. DESC_ENH_DEFAULT
-#, fuzzy
 msgid ""
 "Set default enhancement values <Ctrl-0>:\n"
 "gamma = 1.0\n"
 "brightness = 0\n"
 "contrast = 0"
 msgstr ""
-"Postavi standardne vrednosti za poboljšanje <Shift-d>:\n"
-"gama = 1.0\n"
-"osvetljenje = 0\n"
-"kontrast = 0"
+"Постави стандардне вредности за побољшање <Ctrl-0>:\n"
+"гама = 1.0\n"
+"осветљење = 0\n"
+"контраст = 0"
 
 #. DESC_ENH_RESTORE
-#, fuzzy
 msgid "Restore enhancement values from preferences <Ctrl-r>"
-msgstr "Obnovi vrednosti za poboljšanje slike iz podešavanja <Shift-r>"
+msgstr "Обнови вредности за побољшање из подешавања <Ctrl-r>"
 
 #. DESC_ENH_STORE
-#, fuzzy
 msgid "Store active enhancement values to preferences <Ctrl-+>"
-msgstr "Zapamti aktivne vrednosti za poboljšanje slike u podešavanja <Shift-m>"
+msgstr "Запамти активне вредности за побољшање у подешавања <Ctrl-+>"
 
 #. DESC_HIST_INTENSITY
 msgid "Show histogram of intensity/gray <Alt-i>"
-msgstr "Prikaz histograma svetlosti/grao <Alt-i>"
+msgstr "Приказ хистограма јачине/грао <Alt-i>"
 
 #. DESC_HIST_RED
 msgid "Show histogram of red component <Alt-r>"
-msgstr "Prikaz histograma crvene boje <Alt-r>"
+msgstr "Приказ хистограма црвене компоненте <Alt-r>"
 
 #. DESC_HIST_GREEN
 msgid "Show histogram of green component <Alt-g>"
-msgstr "Prikaz histograma zelene boje <Alt-g>"
+msgstr "Приказ хистограма зелене компоненте <Alt-g>"
 
 #. DESC_HIST_BLUE
 msgid "Show histogram of blue component <Alt-b>"
-msgstr "Prikaz histograma plave boje <Alt-b>"
+msgstr "Приказ хистограма плаве компоненте <Alt-b>"
 
 #. DESC_HIST_PIXEL
 msgid "Display mode: show histogram with lines instead of pixels <Alt-m>"
-msgstr "Prikaz histograma sa linijama umesto piksela <Alt-m>"
+msgstr "Модус екрана: Приказ хистограма са линијама уместо пиксела <Alt-m>"
 
 #. DESC_HIST_LOG
 msgid "Show logarithm of pixelcount <Alt-l>"
-msgstr "Prikaz logaritma od broja piksela <Alt-l>"
+msgstr "Приказ логаритма од броја пиксела <Alt-l>"
 
 #. DESC_PRINTER_SETUP
 msgid "Select definition to change"
-msgstr "Izaberi definiciju za menjanje"
+msgstr "Изабери дефиницију за мењање"
 
 #. DESC_PRINTER_NAME
 msgid "Define a name for the selection of this definition"
-msgstr "Ime definicije"
+msgstr "Одабери име за селекцију те дефиниције"
 
 #. DESC_PRINTER_COMMAND
 msgid "Enter command to be executed in copy mode (e.g. \"lpr\")"
-msgstr "Unesi komandu, koja se izvodi pri kopiranju (na primer \"lpr -\")"
+msgstr "Унеси команду, која се изводи при копирању (на пример \"lpr -\")"
 
 #. DESC_COPY_NUMBER_OPTION
 msgid "Enter option for copy numbers"
-msgstr "Unesi opciju za broj kopija"
+msgstr "Унеси опцију за број копија"
 
 #. DESC_PRINTER_LINEART_RESOLUTION
 msgid ""
 "Resolution with which lineart images are printed and saved in postscript"
-msgstr "Rezolucija, u kojoj se crno/bele slike štampaju i pamte u postscriptu"
+msgstr ""
+"Резолуција, у којој се црно / беле слике штампају и памте у postscript-у"
 
 #. DESC_PRINTER_GRAYSCALE_RESOLUTION
 msgid ""
 "Resolution with which grayscale images are printed and saved in postscript"
-msgstr "Rezolucija, u kojoj se sive slike štampaju i pamte u postscriptu"
+msgstr "Резолуција, у којој се сивве слике штампају и памте у postscript-у"
 
 #. DESC_PRINTER_COLOR_RESOLUTION
 msgid "Resolution with which color images are printed and saved in postscript"
-msgstr "Rezolucija, u kojoj se slike u boji štampaju i pamte u postscriptu"
+msgstr "Резолуција, у којој се слике у боји штампају и памте у postscript-у"
 
 #. DESC_PRINTER_WIDTH
 #. DESC_FAX_WIDTH
 msgid "Width of printable area"
-msgstr "Širina površine za štampanje"
+msgstr "Ширина површине за штампање"
 
 #. DESC_PRINTER_HEIGHT
 #. DESC_FAX_HEIGHT
 msgid "Height of printable area"
-msgstr "Visina površine za štampanje"
+msgstr "Висина површине за штампање"
 
 #. DESC_PRINTER_LEFTOFFSET
 #. DESC_FAX_LEFTOFFSET
 msgid "Left offset from the edge of the paper to the printable area"
-msgstr "Razmak od levog ruba papira do početka površine za štampanje"
+msgstr "Размак од левог руба папира до почетка површине за штампање"
 
 #. DESC_PRINTER_BOTTOMOFFSET
 #. DESC_FAX_BOTTOMOFFSET
 msgid "Bottom offset from the edge of the paper to the printable area"
-msgstr "Razmak od donjeg ruba papira do početka površine za štampanje"
+msgstr "Размак од доњег руба папира до почетка површине за штампање"
 
 #. DESC_PRINTER_GAMMA
 msgid "Additional gamma value for photocopy"
-msgstr "Dodatna vrednost gama pri fotokopiranju"
+msgstr "Додатна вредност гама при фотокопирању"
 
 #. DESC_PRINTER_GAMMA_RED
 msgid "Additional gamma value for red component for photocopy"
-msgstr "Dodatna vrednost gama za crvenu boju pri fotokopiranju"
+msgstr "Додатна вредност гама за црвену компоненту при фотокопирању"
 
 #. DESC_PRINTER_GAMMA_GREEN
 msgid "Additional gamma value for green component for photocopy"
-msgstr "Dodatna vrednost gama za zelenu boju pri fotokopiranju"
+msgstr "Додатна вредност гама за зелену компоненту при фотокопирању"
 
 #. DESC_PRINTER_GAMMA_BLUE
 msgid "Additional gamma value for blue component for photocopy"
-msgstr "Dodatna vrednost gama za plavu boju pri fotokopiranju"
+msgstr "Додатна вредност гама за плаву компоненту при фотокопирању"
 
 #. DESC_PRINTER_EMBED_CSA
 msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-msgstr ""
+msgstr "Направи postscipt фајлу која садржи ICM профил скенера"
 
 #. DESC_PRINTER_EMBED_CRD
 msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-msgstr ""
+msgstr "Направи postscipt фајлу која садржи ICM профил штампача"
 
 #. DESC_PRINTER_CMS_BPC
 msgid "Applies black point compensation"
-msgstr ""
+msgstr "Примени компензацију црне тачке"
 
 #. DESC_PRINTER_PS_FLATEDECODED
 msgid ""
 "Create zlib compressed postscript image for printer (flatedecode).\n"
 "The printer has to understand postscript level 3!"
 msgstr ""
+"Направи zlib компресовану postscript слику за штампач (flatedecode).\n"
+"Штампач треба да разуме postscript степен 3!"
 
 #. DESC_TMP_PATH
 msgid "Path to temp directory"
-msgstr "Put do privremenog direktorijuma"
+msgstr "Пут до привременог директоријума"
 
 #. DESC_BUTTON_TMP_PATH_BROWSE
 msgid "Browse for temporary directory"
-msgstr "Pretraži privremeni direktorijum"
+msgstr "Претражи привремени директоријум"
 
 #. DESC_JPEG_QUALITY
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
-"Kvalitet slike u procentima, ako je slika zapamćena kao JPEG ili TIFF sa "
-"JPEG kompresijom"
+"Квалитет слике у процентима ако је слика запамћена као JPEG или TIFF за JPEG "
+"компресијом"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
-msgstr "Kompresija ako je slika zapamćena kao PNG"
+msgid "Compression if image is saved as PNG"
+msgstr "Компресија ако је слика запамћена као PNG"
 
 #. DESC_FILENAME_COUNTER_LEN
 msgid "Minimum length of counter in filename"
-msgstr "Najkraća dužina brojača u nazivu fajla"
+msgstr "Најкраћа дужина бројача у називу фајле"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-#, fuzzy
-msgid "Compression rate for zip compressed tiff (deflate)"
-msgstr "Vrsta kompresije ako se 8-bitn-a slika pamti kao TIFF"
+msgid "Compression rate for zip compressed TIFF (deflate)"
+msgstr "Висина компресије за zip компресовану TIFF (сажимање)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
-msgstr "Vrsta kompresije ako se 16-bitn-a slika pamti kao TIFF"
+msgid "Compression type if 16 bit image is saved as TIFF"
+msgstr "Врста компресије ако се 16 битна слика памити као TIFF"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
-msgstr "Vrsta kompresije ako se 8-bitn-a slika pamti kao TIFF"
+msgid "Compression type if 8 bit image is saved as TIFF"
+msgstr "Врста компресије ако се 8 битна слика памти као TIFF"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
-msgstr "Vrsta kompresije ako se crno/bela slika pamti kao TIFF"
+msgid "Compression type if lineart image is saved as TIFF"
+msgstr "Врста компресије ако се lineart слика памти као TIFF"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device dependant preferences in default file at exit of xsane"
 msgstr ""
-"Pamti odgovarajuće konfiguracije uređaja u podrazumevanoj fajli pri "
-"napuštanju Xsane-a"
+"Памти одговарајуће конфигурације уређаја у подразумеваној фајли при "
+"напуштању XSane"
 
 #. DESC_OVERWRITE_WARNING
 msgid "Warn before overwriting an existing file"
-msgstr "Upozori pre prepisivanja postojeće fajle"
+msgstr "Упозори пре преписивања постојеће фајле"
 
 #. DESC_SKIP_EXISTING
 msgid ""
 "If filename counter is automatically increased, used numbers are skipped"
 msgstr ""
-"Ako je brojač naziva fajle automatski povećan, postojeći brojevi se "
-"automatski preskaču"
+"Ако је бројач назива фајле аутоматски повећан, постојећи бројеви се "
+"аутоматски прескачу"
 
 #. DESC_SAVE_PS_FLATEDECODED
 msgid ""
 "compress postscript image with zlib algorithm (flatedecode). When you want "
 "to print such a file your printer has to understand postscript level 3"
 msgstr ""
+"компресуј postscript сликз са zlib алогаритмом (flatedecode). Ако ви хоћете "
+"да штампате ваш штампач треба да разуме postscript степен 3"
 
 #. DESC_SAVE_PDF_FLATEDECODED
 msgid "compress PDF image with zlib algorithm (flatedecode)."
-msgstr ""
+msgstr "компресуј PDF слику са zlib алогаритмом (flatedecode)."
 
 #. DESC_SAVE_PNM16_AS_ASCII
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
+"Ако 16 битна слика треба да се запамти у PNM формату тада користите ASCII "
+"формат уместо бинарног формата. Бинарни формат је нови формат и није подржан "
+"од свих програма. ASCII формат је подржан од више програма али прави огромне "
+"фајле!!!"
 
 #. DESC_REDUCE_16BIT_TO_8BIT
-#, fuzzy
 msgid ""
 "If scanner sends image with 16 bits/channel save image with 8 bits/channel"
 msgstr ""
-"Ako skener šalje sliku sa 16 bit-a u boji pamti sliku sa 8 bit-a u boji"
+"Ако скенер шаље слику са 16 бита / каналу памти слику са 8 бита / каналу."
 
 #. DESC_PSFILE_WIDTH
 msgid "Width of paper for postscript files"
-msgstr "Širina papira pri štampanju postcript fajli"
+msgstr "Ширина папира при штампању postcript фајли"
 
 #. DESC_PSFILE_HEIGHT
 msgid "Height of paper for postscript files"
-msgstr "Visina papira pri štampanju postscript fajli"
+msgstr "Висина папира при штампању postscript фајли"
 
 #. DESC_PSFILE_LEFTOFFSET
 msgid ""
 "Left offset from the edge of the paper to the usable area for postscript "
 "files"
-msgstr "Odmak slike od levog ruba papira pri štampanju postscript fajli"
+msgstr "Одмак слике од левог руба папира при штампању postscript фајли"
 
 #. DESC_PSFILE_BOTTOMOFFSET
 msgid ""
 "Bottom offset from the edge of the paper to the usable area for postscript "
 "files"
-msgstr "Odmak slike od donjeg ruba papira pri štampanju postscript fajli"
+msgstr "Одмак слике од доњег руба папира при штампању postscript фајли"
 
 #. DESC_MAIN_WINDOW_FIXED
 msgid "Use fixed main window size or scrolled, resizable main window"
-msgstr "Upotrebi fiksiranu ili promenljivu glavnu stranu"
+msgstr "Употреби фиксирану или променљиву главну страну"
 
 #. DESC_DISABLE_GIMP_PREVIEW_GAMMA
-#, fuzzy
 msgid "Disable preview gamma when XSane runs as GIMP plugin"
-msgstr "Onemogući pregled gama, ako se Xsane upotrebljava kao uložak za Gimp"
+msgstr "Онемогући преглед гама ако XSane се користи као додатак за Gimp."
 
 #. DESC_PREVIEW_COLORMAP
 msgid "Use an own colormap for preview if display depth is 8 bpp"
-msgstr ""
-"Upotrebi svoju paletu boja za pregled ako se koristi dubina ekrana od 8 bpp"
+msgstr "Употреби своју палету боја за преглед ако је дубина екрана 8 bpp"
 
 #. DESC_SHOW_RANGE_MODE
 msgid "Select how a range is displayed"
-msgstr ""
+msgstr "Изабери како се показује опсег"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
-msgstr "Vrednost, sa kojom se pomnožava izračunata rezolucija pregleda"
+msgid "Value with which the calculated preview resolution is multiplied"
+msgstr "Вредност са којом се помножава израчуната резолуција прегледа"
 
 #. DESC_PREVIEW_GAMMA
 msgid "Set gamma correction value for preview image"
-msgstr "Odredi vrednost gama pri pregledu slike"
+msgstr "Одреди вредност гама корекције при прегледу слике"
 
 #. DESC_PREVIEW_GAMMA_RED
 msgid "Set gamma correction value for red component of preview image"
-msgstr "Odredi vrednost gama za crvenu boju pri pregledu slike"
+msgstr "Одреди вредност гама корекције за црвену компоненту при прегледу слике"
 
 #. DESC_PREVIEW_GAMMA_GREEN
 msgid "Set gamma correction value for green component of preview image"
-msgstr "Odredi vrednost gama za zelenu boju pri pregledu slike"
+msgstr "Одреди вредност гама корекције за зелену компоненту при прегледу слике"
 
 #. DESC_PREVIEW_GAMMA_BLUE
 msgid "Set gamma correction value for blue component of preview image"
-msgstr "Odredi vrednost gama za plavu boju pri pregledu slike"
+msgstr "Одреди вредност гама корекције за плаву компоненту при прегледу слике"
 
 #. DESC_LINEART_MODE
 msgid "Define the way XSane shall handle the threshold option"
-msgstr "Definišite način, kako Xsane određuje prag šuma"
+msgstr "Одредите начин, како XSane одређује праг шума"
 
 #. DESC_GRAYSCALE_SCANMODE
 msgid ""
 "Select grayscale scanmode. This scanmode is used for lineart preview scan "
 "when transformation from grayscale to lineart is enabled"
 msgstr ""
-"Selektiraj sivi način skeniranja, Taj način se upotrebljava za crno/bele "
-"slike ako je transformacija iz sive u crno/belu omogućena"
+"Селектирај сиви начин скенирања. Тај начин се употребљава за црно / беле "
+"прегледе ако је трансформација из сиве у црно / белу омогућена"
 
 #. DESC_PREVIEW_THRESHOLD_MIN
 #, no-c-format
 msgid "The scanner's minimum threshold level in %"
-msgstr "Donja vrednost praga šuma u %"
+msgstr "Доња вредност прага шума у %"
 
 #. DESC_PREVIEW_THRESHOLD_MAX
 #, no-c-format
 msgid "The scanner's maximum threshold level in %"
-msgstr "Gornja vrednost praga šuma u %"
+msgstr "Горња вредност прага шума у %"
 
 #. DESC_PREVIEW_THRESHOLD_MUL
 msgid ""
 "Multiplier to make XSane threshold range and scanner threshold range the same"
-msgstr "Umnožavač, koji prag šuma skenera i programa Xsane usklađuje"
+msgstr "Умножавач, који праг шума скенера и XSane усклађује"
 
 #. DESC_PREVIEW_THRESHOLD_OFF
 msgid ""
 "Offset to make XSane threshold range and scanner threshold range the same"
-msgstr "Odmak, koji prag šuma skenera i programa Xsane usklađuje"
+msgstr "Одмак, који праг шума скенера и XSane усклађује"
 
 #. DESC_ADF_PAGES_MAX
 msgid "Number of pages to scan"
-msgstr ""
+msgstr "Број страна за скенирање"
 
 #. DESC_PREVIEW_PIPETTE_RANGE
 msgid "dimension of square that is used to average color for pipette function"
-msgstr "Veličina kvadrata, koji se koristi da uskladi boju za funkciju pipete."
+msgstr "Величина квадрата, који се користи да усклади боју за функцију пипете."
 
 #. DESC_DOC_VIEWER
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
-msgstr "Dajte komandu, sa kojom se prikazuju pomoćni fajlovi HTML!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
+msgstr ""
+"Дајте команду, са којом се приказују помоћни фајлови, мора бити HTML "
+"приказивач!"
 
 #. DESC_AUTOENHANCE_GAMMA
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr ""
-"Prilagodi vrednost gama pri upotrebi dugmeta za auto poboljšavanje slike"
+"Гама вредност ће се подесити, ако се дугме за аутоматско побољшање притисне "
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
-msgstr "Izaberi površinu za skeniranje posle završetka pregleda"
+#. DESC_PRESELECT_SCAN_AREA
+msgid "Select scan area after preview scan has finished"
+msgstr "Изабери опсег скенирања после прегледа који је завршен"
 
 #. DESC_AUTOCORRECT_COLORS
 msgid "Do color correction after preview scan has finished"
-msgstr "Uradi korekciju boje posle završetka pregleda"
+msgstr "Уради корекцију боје после завршетка прегледа"
 
 #. DESC_RENDERING_INTENT
-#, fuzzy
 msgid "Select rendering intent for preview and saving"
-msgstr "Izaberi površinu za skeniranje posle završetka pregleda"
+msgstr "Изабери rendering intent за преглед и памћење"
 
 #. DESC_CMS_BPC
 msgid "Apply black point compensation when color transformation is done"
-msgstr ""
+msgstr "Уради компензацију црне тачке ако је претварање боје урађено"
 
 #. DESC_FAX_COMMAND
 msgid "Enter command to be executed in fax mode"
-msgstr "Dajte komandu koja je potrebna za slanje faksa"
+msgstr "Дајте команду која ће се извршити у факс модусу"
 
 #. DESC_FAX_RECEIVER_OPT
 msgid "Enter option to specify receiver"
-msgstr "Opcija sa kojom sa određuje telefonski broj prijemnika"
+msgstr "Опција са којом се одређује телефонски број пријемника"
 
 #. DESC_FAX_POSTSCRIPT_OPT
 msgid "Enter option to specify postscript files following"
-msgstr "Opcija sa kojom sa određuje slanje postscript fajlova"
+msgstr "Опција са којом се одређује да следи слање postscript фајлова"
 
 #. DESC_FAX_NORMAL_OPT
 msgid "Enter option to specify normal mode (low resolution)"
-msgstr "Opcija sa kojom sa određuje vertikalna rezolucija od 98 lpi"
+msgstr ""
+"Опција са којом се одређује нормални модус (ниска резолуција, вертикална "
+"резолуција од 98 lpi)"
 
 #. DESC_FAX_FINE_OPT
 msgid "Enter option to specify fine mode (high resolution)"
-msgstr "Opcija sa kojom sa određuje vertikalna rezolucija od 196 lpi"
+msgstr ""
+"Опција са којом се одређује фини модус (висока резолуција, вертикална "
+"резолуција од 196 lpi)"
 
 #. DESC_FAX_VIEWER
 msgid "Enter command to be executed to view a fax"
-msgstr "Komanda za prikazivanje faksa"
+msgstr "Команда за приказивање факса"
 
 #. DESC_FAX_FINE_MODE
 msgid "Send fax with high vertical resolution (196 lpi instead of 98 lpi)"
-msgstr "Šalji faks u visokoj rezoluciji po osi y (196 lpi umesto 98 lpi)"
+msgstr "Шаљи факс у високој вертикалној резолуцији (196 lpi уместо 98 lpi)"
 
 #. DESC_FAX_PS_FLATEDECODED
 msgid "Create zlib compressed postscript image for fax (flatedecode)"
-msgstr ""
+msgstr "Направи са zlib компресовану postscript слику за факс (flatedecode)"
 
 #. DESC_SMTP_SERVER
 msgid "IP Address or Domain name of SMTP server"
-msgstr "IP adresa ili ime domena SMTP servera"
+msgstr "IP адреса или име домена SMTP сервера"
 
 #. DESC_SMTP_PORT
 msgid "port to connect to SMTP server"
-msgstr "port na kojem SMTP server treba da bude povezan"
+msgstr "порт на којем SMTP сервер треба да буде повезан"
 
 #. DESC_EMAIL_FROM
-#, fuzzy
 msgid "enter your e-mail address"
-msgstr "unesite vašu e-poštansku adresu"
+msgstr "унесите адресу ваше е-поште"
 
 #. DESC_EMAIL_REPLY_TO
-#, fuzzy
 msgid "enter e-mail address for replied e-mails"
-msgstr "unesite e-poštansku adresu za odgovore na ovu adresu"
+msgstr "унесите адресу е-поште за одговоре на е-пошту"
 
 #. DESC_EMAIL_AUTHENTICATION
-#, fuzzy
 msgid "Type of authentication before sending e-mail"
-msgstr "Autentifikaciju POP3 servera isvršiti pre slanja e-pošte"
+msgstr "Врста ауторизације пре слања е-поште"
 
 #. DESC_EMAIL_AUTH_USER
-#, fuzzy
 msgid "user name for e-mail server"
-msgstr "korisničko ime za POP3 server"
+msgstr "корисничко име за сервер Е-поште"
 
 #. DESC_EMAIL_AUTH_PASS
-#, fuzzy
 msgid "password for e-mail server"
-msgstr "lozinka za POP3 server"
+msgstr "лозинка за сервер е-поште"
 
 #. DESC_POP3_SERVER
 msgid "IP Address or Domain name of POP3 server"
-msgstr "IP adresa ili ime domena POP3 servera"
+msgstr "IP адреса или име домена POP3 сервера"
 
 #. DESC_POP3_PORT
 msgid "port to connect to POP3 server"
-msgstr "port na kojem POP3 server treba da bude povezan"
+msgstr "порт на којем POP3 сервер треба да буде повезан"
 
 #. DESC_HTML_EMAIL
-#, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
-msgstr "e-pošta je poslata u html modusu, slike su prikazane direktno"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
+msgstr "е-пошта је послата у HTML модусу, стави слику са: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
-msgstr "Komanda za startanje vašeg OCR programa"
+msgid "Enter command to start OCR program"
+msgstr "Стави команду за ваш OCR програм"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
-msgstr "Opcija od OCR programa koja definiše ulazni fajl"
+msgid "Enter option of the OCR program to define input file"
+msgstr "Стави  команду од OCR програма која одређује улазну фајлу"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
-msgstr "Opcija od OCR programa koja definiše izlazni fajl"
+msgid "Enter option of the OCR program to define output file"
+msgstr "Унеси опцију од OCR програма која одређује излазну фајлу"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
-msgstr ""
+msgid "Define if the OCR program supports gui progress pipe"
+msgstr "Одреди да ли OCR програм подржава напредак GUI цеви"
 
 #. DESC_OCR_OUTFD_OPT
-#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
-msgstr "Opcija od OCR programa koja definiše izlazni fajl"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
+msgstr "Унеси опцију OCR која одређује излазни индекс у GUI модусу"
 
 #. DESC_OCR_PROGRESS_KEYWORD
 msgid "Define Keyword that is used to mark progress information"
-msgstr ""
+msgstr "Одреди кључну реч која се користи за информацију прогреса"
 
 #. DESC_PERMISSION_READ
 msgid "read"
-msgstr "čitati"
+msgstr "читати"
 
 #. DESC_PERMISSION_WRITE
 msgid "write"
-msgstr "pisati"
+msgstr "писати"
 
 #. DESC_PERMISSION_SEARCH
-#, fuzzy
 msgid "search"
-msgstr "korisnik"
+msgstr "тражи"
 
 #. DESC_ADD_BATCH
-#, fuzzy
 msgid "Add selection for batch scan"
-msgstr "Dodaj izbor u listu"
+msgstr "Додаз избор у пакет"
 
 #. DESC_PIPETTE_WHITE
 msgid "Pick white point"
-msgstr "Izberi belu tačku"
+msgstr "Изабери белу тачку"
 
 #. DESC_PIPETTE_GRAY
 msgid "Pick gray point"
-msgstr "Izberi sivu tačku"
+msgstr "Изабери сиву тачку"
 
 #. DESC_PIPETTE_BLACK
 msgid "Pick black point"
-msgstr "Izberi crnu tačku"
+msgstr "Изабери црну тачку"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
-msgstr "Upotrebi celu površinu skeniranja"
+msgid "Use full scan area"
+msgstr "Употреби целу површину за скенирање"
 
 #. DESC_ZOOM_OUT
 #, no-c-format
 msgid "Zoom 20% out"
-msgstr "Smanji za 20% "
+msgstr "Смањи за 20%"
 
 #. DESC_ZOOM_IN
 msgid "Click at position to zoom to"
-msgstr ""
+msgstr "Притисни на позицију да је повећаш"
 
 #. DESC_ZOOM_AREA
 msgid "Zoom into selected area"
-msgstr "Uvećavaj u izabrano područje"
+msgstr "Увећај у изабрано подручје"
 
 #. DESC_ZOOM_UNDO
 msgid "Undo last zoom"
-msgstr "Odbaci zadnje uvećavanje"
+msgstr "Одбаци задње увећавање"
 
 #. DESC_FULL_PREVIEW_AREA
 msgid "Select visible area"
-msgstr "Izaberi vidnu površinu"
+msgstr "Изабери видну површину"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
-msgstr "Automatska selekcija površine skeniranja"
+#. DESC_AUTOSELECT_SCAN_AREA
+msgid "Autoselect scan area"
+msgstr "Одреди аутоматски површину за скенирање"
 
-#. DESC_AUTORAISE_SCANAREA
-#, fuzzy
-msgid "Autoraise scanarea"
-msgstr "Automatska selekcija površine skeniranja"
+#. DESC_AUTORAISE_SCAN_AREA
+msgid "Autoraise scan area"
+msgstr "Започни аутоматски површину за скенирање"
 
 #. DESC_DELETE_IMAGES
 msgid "Delete preview image cache"
-msgstr "Obriši pregled slike"
+msgstr "Обриши кеш прегледа слике"
 
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
+"Постави унапред опсег:\n"
+"Да додаш нови опсег или да промениш неки постојећи опсег користи контексни "
+"мени (алтернативни тастер миша)"
 
 #. DESC_ROTATION
 msgid "Rotate preview and scan"
-msgstr "Rotiraj pregled i skeniraj"
+msgstr "Ротирај преглед и скенирај"
 
 #. DESC_RATIO
 msgid "Aspect ratio of selection"
-msgstr ""
+msgstr "Однос страна избора"
 
 #. DESC_PAPER_ORIENTATION
 msgid "Define image position for printing"
-msgstr ""
+msgstr "Одреди позицију слике за штампање"
 
 #. DESC_VIEWER_OCR
 msgid "Optical Character Recognition"
-msgstr "Optical Character Recongnition"
+msgstr "Оптичко разпознавање знакова (OCR)"
 
 #. DESC_VIEWER_UNDO
-#, fuzzy
 msgid "Undo last change"
-msgstr "Odbaci zadnje uvećavanje"
+msgstr "Одбаци задњу промену"
 
 #. DESC_VIEWER_CLONE
 msgid "Clone image"
-msgstr "Kopiraj sliku"
+msgstr "Копирај слику"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
-msgstr "Rotiraj sliku za 90 stepeni"
+msgid "Rotate image 90 degrees"
+msgstr "Окрени слику за 90 степени"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
-msgstr "Rotiraj sliku za 180 stepeni"
+msgid "Rotate image 180 degrees"
+msgstr "Окрени слику за 180 степени"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
-msgstr "Rotiraj sliku za 270 stepeni"
+msgid "Rotate image 270 degrees"
+msgstr "Окрени слику за 270 степени"
 
 #. DESC_MIRROR_X
 msgid "Mirror image at vertical axis"
-msgstr "Ogledaj sliku u vertikalnoj osi"
+msgstr "Огледај слику у вертикалној оси"
 
 #. DESC_MIRROR_Y
 msgid "Mirror image at horizontal axis"
-msgstr "Ogledaj sliku u horizontalnoj osi"
+msgstr "Огледај слику у хоризонталној оси"
 
 #. DESC_VIEWER_ZOOM
 msgid "Zoom image"
-msgstr "Uveličaj sliku"
+msgstr "Увеличај слику"
 
 #. DESC_STORE_MEDIUM
-#, fuzzy
 msgid "Store medium"
-msgstr "Izaberi izvor medijuma"
+msgstr "Запамти уређај"
 
 #. DESC_DELETE_MEDIUM
-#, fuzzy
 msgid "Delete active medium"
-msgstr "Izbriši sliku"
+msgstr "Избриши активни уређај"
 
 #. DESC_SCALE_FACTOR
-#, fuzzy
 msgid "Scale factor"
-msgstr "Odredi X stepen povećavanja:"
+msgstr "Фактор повећавања"
 
 #. DESC_X_SCALE_FACTOR
-#, fuzzy
 msgid "X-Scale factor"
-msgstr "Odredi X stepen povećavanja:"
+msgstr "Фактор повећавања по оси X"
 
 #. DESC_Y_SCALE_FACTOR
-#, fuzzy
 msgid "Y-Scale factor"
-msgstr "Odredi Y stepen povećavanja:"
+msgstr "Фактор повећавања по оси Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
-msgstr ""
+msgid "Scale image to width [pixels]"
+msgstr "Повећај слику по ширини [у тачкама]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
-msgstr ""
+msgid "Scale image to height [pixels]"
+msgstr "Повећај слику по висину [у тачкама]"
 
 #. DESC_BATCH_LIST_EMPTY
-#, fuzzy
 msgid "Empty batch list"
-msgstr "Saveti za skeniranje"
+msgstr "Празан пакет"
 
 #. DESC_BATCH_LIST_SAVE
 msgid "Save batch list"
-msgstr ""
+msgstr "Запамти пакете"
 
 #. DESC_BATCH_LIST_LOAD
 msgid "Load batch list"
-msgstr ""
+msgstr "отвори пакет"
 
 #. DESC_BATCH_RENAME
-#, fuzzy
 msgid "Rename area"
-msgstr "Preimenuj stranu"
+msgstr "Преименуј опсег"
 
 #. DESC_BATCH_ADD
-#, fuzzy
 msgid "Add selected preview area to batch list"
-msgstr "Dodaj izbor u listu"
+msgstr "Додај избор прегледа у пакете"
 
 #. DESC_BATCH_DEL
 msgid "Delete selected area from batch list"
-msgstr ""
+msgstr "Обриши одабрани опсег из пакета"
 
 #. DESC_AUTOMATIC
 msgid "Turns on automatic mode"
-msgstr ""
+msgstr "Укључи аутоматски модус"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_COLOR_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for scanner default color ICM-profile"
-msgstr "Traži slike po nazivima fajla"
+msgstr "Тражи подразумевани ICM профил за боју"
 
 #. DESC_BUTTON_SCANNER_DEFAULT_GRAY_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for scanner default gray ICM-profile"
-msgstr "Traži slike po nazivima fajla"
+msgstr "Тражи подразумевани ICM профил за грао"
 
 #. DESC_BUTTON_DISPLAY_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for display ICM-profile"
-msgstr "Traži slike po nazivima fajla"
+msgstr "Тражи ICM профил за екран"
 
 #. DESC_BUTTON_PRINTER_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for printer ICM-profile"
-msgstr "Traži slike po nazivima fajla"
+msgstr "Тражи ICM профил за штампач"
 
 #. DESC_BUTTON_CUSTOM_PROOFING_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for custom proofing ICM-profile"
-msgstr "Traži slike po nazivima fajla"
+msgstr "Тражи корисников пробни ICM профил"
 
 #. DESC_BUTTON_WORKING_COLOR_SPACE_ICM_PROFILE_BROWSE
-#, fuzzy
 msgid "Browse for working color space ICM-profile"
-msgstr "Traži slike po nazivima fajla"
+msgstr "Тражи за радни простор ICM профила у боји"
 
 #. ERR_HOME_DIR
 msgid "Failed to determine home directory:"
-msgstr "Neuspelo učitavanje korisničkog direktorijuma:"
+msgstr "Неуспело учитавање корисничког директоријума:"
 
 #. ERR_CHANGE_WORKING_DIR
 msgid "Failed to change working directory to"
-msgstr "Neuspelo menjanje radnog direktorijuma do"
+msgstr "Неуспело мењање радоног директоријума до"
 
 #. ERR_FILENAME_TOO_LONG
 msgid "Filename too long"
-msgstr "Naziv fajla je predugačak"
+msgstr "Назив фајле је предугачак"
 
 #. ERR_CREATE_TEMP_FILE
 msgid ""
@@ -2573,346 +2510,337 @@ msgid ""
 "select a temporary directory where you have\n"
 "write permissions."
 msgstr ""
+"Не могу да направим привремену фајлу.\n"
+"Отвори мени подешавања -> Подеси Таб Запамти и\n"
+"изабери привремену директорију где имате права\n"
+"да пишете."
 
 #. ERR_SET_OPTION
 msgid "Failed to set value of option"
-msgstr "Greška pri promeni opcije"
+msgstr "Грешка при промени опције"
 
 #. ERR_GET_OPTION
 msgid "Failed to obtain value of option"
-msgstr "Greška pri čitanju opcije"
+msgstr "Грешка при читању опције"
 
 #. ERR_OPTION_COUNT
 msgid "Error obtaining option count"
-msgstr "Nisam mogao da odredim broj opcija"
+msgstr "Нисам могао да одредим број опција"
 
 #. ERR_DEVICE_OPEN_FAILED
 msgid "Failed to open device"
-msgstr "Greška pri otvaranju uređaja"
+msgstr "Грешка при отварању уређаја"
 
 #. ERR_NO_DEVICES
 msgid "no devices available"
-msgstr "Nijedan uređaj nije dostupan"
+msgstr "Ниједан уређај није доступан"
 
 #. ERR_DURING_READ
 msgid "Error during read:"
-msgstr "Greška pri čitanju:"
+msgstr "Грешка при читању:"
 
 #. ERR_DURING_SAVE
 msgid "Error during save:"
-msgstr "Greška pri pamćenju:"
+msgstr "Грешка при памћењу:"
 
 #. ERR_BAD_DEPTH
 msgid "Can't handle depth"
-msgstr "Nepodržana dubina bita"
+msgstr "Ноподржана дубина бита"
 
 #. ERR_UNKNOWN_SAVING_FORMAT
 msgid "Unknown file format for saving"
-msgstr "Nepoznat naziv fajla za pamćenje"
+msgstr "Непознат формат фајле за памћење"
 
 #. ERR_OPEN_FAILED
 msgid "Failed to open"
-msgstr "Greška pri otvaranju"
+msgstr "Грешка при отварању"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
-msgstr "Ne mogu napraviti sigurnosnu fajlu (možda je veza koja postoji):"
+msgid "Could not create secure file (maybe a link does exist):"
+msgstr "Не могу направити сигурну фајлу (можда постоји линк):"
 
 #. ERR_FAILED_PRINTER_PIPE
 msgid "Failed to open pipe for executing printercommand"
-msgstr "Greška pri otvaranju cevovoda za štampanje"
+msgstr "Грешка при отварању цеви за штампање"
 
 #. ERR_FAILED_EXEC_PRINTER_CMD
 msgid "Failed to execute printercommand:"
-msgstr "Greška pri izvršenju komande za štampanje"
+msgstr "Грешка при извршењу команде за штампање:"
 
 #. ERR_FAILED_START_SCANNER
 msgid "Failed to start scanner:"
-msgstr "Greška pri startanju skenera:"
+msgstr "Грешка при стартању скенера:"
 
 #. ERR_FAILED_GET_PARAMS
 msgid "Failed to get parameters:"
-msgstr "Greška pri čitanju parametara:"
+msgstr "Грешка при читању параметара:"
 
 #. ERR_NO_OUTPUT_FORMAT
 msgid "No output format given"
-msgstr "Izlazni format nija dan"
+msgstr "Излазни формат није дан"
 
 #. ERR_NO_MEM
 msgid "out of memory"
-msgstr "Ponestalo je memorije"
+msgstr "Понестало је меморије"
 
 #. ERR_TOO_MUCH_DATA
 msgid "Backend sends more image data than it defined in parameters"
 msgstr ""
-"Backend-i šalju više podatako o slici, nego što je definisano u parametrima"
+"Додатци шаљу више податако о слици, него што је дефинисано у параметрима"
 
 #. ERR_LIBTIFF
 msgid "LIBTIFF reports error"
-msgstr "LIBTIFF javlja grešku"
+msgstr "LIBTIFF јавља грешку"
 
 #. ERR_LIBPNG
 msgid "LIBPNG reports error"
-msgstr "LIBPNG javlja grešku"
+msgstr "LIBPNG јавља грешку"
 
 #. ERR_LIBJPEG
-#, fuzzy
 msgid "LIBJPEG reports error"
-msgstr "LIBPNG javlja grešku"
+msgstr "LIBJPEG јавља грешку"
 
 #. ERR_ZLIB
 msgid "ZLIB error or memory allocation problem"
-msgstr ""
+msgstr "ZLIB грешка или проблем доделе меморије"
 
 #. ERR_UNKNOWN_TYPE
 msgid "unknown type"
-msgstr "nopoznata vrsta"
+msgstr "непозната врста"
 
 #. ERR_UNKNOWN_CONSTRAINT_TYPE
 msgid "unknown constraint type"
-msgstr "nepoznata nametnuta vrsta"
+msgstr "непозната предвиђена врста"
 
 #. ERR_OPTION_NAME_NULL
 msgid "Option has empty name (NULL)."
-msgstr ""
+msgstr "Опција нема имена (НУЛА)."
 
 #. ERR_BACKEND_BUG
 msgid "This is a backend bug. Please inform the author of the backend!"
-msgstr ""
+msgstr "То је грешка додатка. Молим обавестите аутора додатка!"
 
 #. ERR_FAILED_EXEC_DOC_VIEWER
 msgid "Failed to execute documentation viewer:"
-msgstr "Greška pri izvršenju prikazivača dokumentacije:"
+msgstr "Грешка при извршењу приказивача документације:"
 
 #. ERR_FAILED_EXEC_FAX_VIEWER
 msgid "Failed to execute fax viewer:"
-msgstr "Greška pri izvršenju prikazivača faksova:"
+msgstr "Грешка при извршењу приказивача факсова:"
 
 #. ERR_FAILED_EXEC_FAX_CMD
 msgid "Failed to execute fax command:"
-msgstr "Greška pri izvršenju komande za faks:"
+msgstr "Грешка при извршењу команде за факс:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Greška pri izvršenju komande za OCR:"
+msgid "Failed to execute OCR command:"
+msgstr "Грешка при извршењу команде за OCR:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
-msgstr "neočekivan format okvira"
+msgstr "неочекиван формат оквира"
 
 #. ERR_FAILED_SET_RESOLUTION
 msgid "unable to set resolution"
-msgstr "Nisam mogao rezoluciju definisati"
+msgstr "Нисам могао одредити резолуцију"
 
 #. ERR_PASSWORD_FILE_INSECURE
 #, c-format
 msgid "Password file (%s) is insecure, use permission x00\n"
-msgstr "Fajla sa lozinkama (%s) je nesigurna, koristi dozvole x00\n"
+msgstr "Фајла са лозинкама (%s) је несигурна, користи дозволе x00\n"
 
 #. ERR_ERROR
 msgid "error"
-msgstr "greška"
+msgstr "грешка"
 
 #. ERR_MAJOR_VERSION_NR_CONFLICT
 msgid "Sane major version number mismatch!"
-msgstr "Glavna verzije sane ne odgovara!"
+msgstr "Главна верзија Sane не одговара!"
 
 #. ERR_XSANE_MAJOR_VERSION
 msgid "XSane major version ="
-msgstr "XSane glavna verzija ="
+msgstr "XSane главна верзија ="
 
 #. ERR_BACKEND_MAJOR_VERSION
 msgid "backend major version ="
-msgstr "backend glavna verzija ="
+msgstr "додатак главна верзија ="
 
 #. ERR_PROGRAM_ABORTED
 msgid "*** PROGRAM ABORTED ***"
-msgstr "*** PROGRAM JE OBUSTAVLJEN ***"
+msgstr "*** ПРОГРАМ ЈЕ ОБУСТАВЉЕН ***"
 
 #. ERR_FAILED_ALLOCATE_IMAGE
 msgid "Failed to allocate image memory:"
-msgstr "Greška pri dodeljivanju memorije za sliku"
+msgstr "Грешка при додели меморије за слику"
 
 #. ERR_PREVIEW_BAD_DEPTH
 msgid "Preview cannot handle bit depth"
-msgstr "Pregled ne nepodržava dubinu bita"
+msgstr "Преглед не подржава дубину бита"
 
 #. ERR_GIMP_SUPPORT_MISSING
 msgid "GIMP support missing"
-msgstr "Nedostaje podržavanje za GIMP"
+msgstr "Недостаје подршка за GIMP"
 
 #. ERR_CREATE_FAX_PROJECT
 msgid "Could not create faxproject"
-msgstr "Ne mogu napraviti faks projekat"
+msgstr "Не могу направити факс пројект"
 
 #. WARN_COUNTER_UNDERRUN
 msgid "Filename counter underrun"
-msgstr "Brojač naziva fajla je prekoračio opseg"
+msgstr "Бројач назива фајла је прекорачио опсег"
 
 #. WARN_NO_VALUE_CONSTRAINT
 msgid "warning: option has no value constraint"
-msgstr "upozorenje: opcija nema dozvoljenu vrednost"
+msgstr "упозорење: опција нема предвиђену вредност"
 
 #. WARN_XSANE_AS_ROOT
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
-"Vi pokušavate da startate Xsane kao ROOT, \n"
-"to je vrlo OPASNO!\n"
+"Ви покушавате да стартате XSane као ROOT, то је врло ОПАСНО \n"
 "\n"
-"Ne šaljite nikakav report greške ako vi\n"
-"imate bilo koji problem koristeći Xsane kao root\n"
-"Upozoreni ste, morate se sami snaći!"
+"Не шаљите никакав репорт грешке ако виi\n"
+"имате било који проблем користећи XSane као root\n"
+"Упозорени сте , морате се сами снаћи!"
 
 #. ERR_HEADER_ERROR
 msgid "Error"
-msgstr "Greška"
+msgstr "Грешка"
 
 #. ERR_HEADER_WARNING
 msgid "Warning"
-msgstr "Upozorenje"
+msgstr "Упозорење"
 
 #. ERR_HEADER_INFO
 msgid "Information"
-msgstr "Obaveštenje"
+msgstr "Обавештење"
 
 #. ERR_HEADER_CHILD_PROCESS_ERROR
 msgid "Child process error"
-msgstr ""
+msgstr "Грешка процеса наследника"
 
 #. ERR_FAILED_CREATE_FILE
 msgid "Failed to create file:"
-msgstr "Greška pri pravljenju fajla:"
+msgstr "Грешка при прављењу фајле:"
 
 #. ERR_LOAD_DEVICE_SETTINGS
 msgid "Error while loading device settings:"
-msgstr "Greška pri učitavanju podešavanja uređaja:"
+msgstr "Грешка при учитавању подешавања уређаја:"
 
 #. ERR_NO_DRC_FILE
 msgid "is not a device-rc-file !!!"
-msgstr "nije fajl sa podatcimo o device-rc"
+msgstr "Није фајла са податцима о апарату!!!"
 
 #. ERR_NETSCAPE_EXECUTE_FAIL
 msgid "Failed to execute netscape!"
-msgstr "Greška pri izvršenju pretraživača!"
+msgstr "Грешка при извршењу претраживача!"
 
 #. ERR_SENDFAX_RECEIVER_MISSING
 msgid "Send fax: no receiver defined"
-msgstr "Greška pri slanju faksa: prijemnik nije dat"
+msgstr "Грешка при слању факса: пријемник није дат"
 
 #. ERR_CREATED_FOR_DEVICE
 msgid "has been created for device"
-msgstr "bila je napravljena za uređaj"
+msgstr "била је направљена за уређај"
 
 #. ERR_USED_FOR_DEVICE
 msgid "you want to use it for device"
-msgstr "upotrebljavaće se za uređaj"
+msgstr "употребљаваће се за уређај"
 
 #. ERR_MAY_CAUSE_PROBLEMS
 msgid "this may cause problems!"
-msgstr "to može praviti probleme!"
+msgstr "то може правити проблеме!"
 
 #. WARN_UNSAVED_IMAGES
 #, c-format
 msgid "There are %d unsaved images"
-msgstr "Ima %d nezapamćenih slika"
+msgstr "Има %d незапамћених слика"
 
 #. WARN_FILE_EXISTS
 #, c-format
 msgid "File %s already exists"
-msgstr "Fajl %s već postoji"
+msgstr "Фајл %s већ постоји"
 
 #. ERR_FILE_NOT_EXISTS
 #, c-format
 msgid "File %s does not exist"
-msgstr "Fajl %s ne postoji"
+msgstr "Фајл %s не постоји"
 
 #. ERR_FILE_NOT_POSTSCRIPT
 #, c-format
 msgid "File %s is not a postscript file"
-msgstr "Fajl  %s nije postcript"
+msgstr "Фајл %s није postcript"
 
 #. ERR_UNSUPPORTED_OUTPUT_FORMAT
 #, c-format
 msgid "Unsupported %d-bit output format: %s"
-msgstr "Nepodržani %d- bitni izlazni format %s"
+msgstr "Неподржани %d- битни излазни формат: %s"
 
 #. ERR_CMS_CONVERSION
-#, fuzzy
 msgid "Error during CMS conversion:"
-msgstr "Greška pri pamćenju:"
+msgstr "Грешка при CMS промени:"
 
 #. ERR_CMS_OPEN_ICM_FILE
-#, fuzzy
 msgid "Could not open"
-msgstr "Greška pri otvaranju"
+msgstr "Не могу отворити"
 
 #. CMS_SCANNER_ICM
-#, fuzzy
 msgid "scanner ICM profile"
-msgstr "Odstrani štampač"
+msgstr "ICM профил скенера"
 
 #. CMS_DISPLAY_ICM
-#, fuzzy
 msgid "display ICM profile"
-msgstr "Traži slike po nazivima fajla"
+msgstr "ICM профил за екран"
 
 #. CMS_PROOF_ICM
-#, fuzzy
 msgid "proofing ICM profile"
-msgstr "Odstrani štampač"
+msgstr "пробни ICM профил"
 
 #. ERR_CMS_CREATE_TRANSFORM
-#, fuzzy
 msgid "Could not create transform"
-msgstr "Ne mogu da napravim privremeni fajl"
+msgstr "Не могу да претворим"
 
 #. WARN_VIEWER_IMAGE_NOT_SAVED
 msgid "viewer image is not saved"
-msgstr "Slika prikazivača nije zapamćena"
+msgstr "Слика приказивача није запамћена"
 
 #. FILE_FILTER_ALL_FILES
 msgid "All files"
-msgstr ""
+msgstr "Све фајле"
 
 #. FILE_FILTER_IMAGES
-#, fuzzy
 msgid "Images"
-msgstr "Slika"
+msgstr "Слике"
 
 #. FILE_FILTER_XBL
-#, fuzzy
 msgid "XSane batch list"
-msgstr "Saveti za skeniranje"
+msgstr "XSane пакети"
 
 #. FILE_FILTER_ICM
 msgid "ICC/ICM Profiles"
-msgstr ""
+msgstr "ICC/ICM профили"
 
 #. FILE_FILTER_DRC
-#, fuzzy
 msgid "XSane device preferences"
-msgstr "Zapamti podešavanja uređaja pri izlazu"
+msgstr "XSane подешавања уређаја"
 
 #. FILE_FILTER_RC
-#, fuzzy
 msgid "XSane preferences"
-msgstr "Podešavanja"
+msgstr "XSane подешавања"
 
 #. TEXT_USAGE
 msgid "Usage:"
-msgstr "Upotreba:"
+msgstr "Употреба:"
 
 #. TEXT_USAGE_OPTIONS
 msgid "[OPTION]... [DEVICE]"
-msgstr "[OPCIJA]... [UREĐAJ]"
+msgstr "[ОПЦИЈА]... [УРЕЂАЈ]"
 
 #. TEXT_HELP
-#, fuzzy
 msgid ""
 "Start up graphical user interface to access SANE (Scanner Access Now Easy) "
 "devices.\n"
@@ -2948,57 +2876,56 @@ msgid ""
 " --sync                       request a synchronous connection with the X11 "
 "server"
 msgstr ""
-"Startaj grafički korisnički interfejs (GUI) da dobiješ pristup do SANE "
-"(Scanner Access Now Easy) uređaja.\n"
+"Стартај графички кориснички интерфејс (GUI) да добијеш приступ до SANE "
+"(Scanner Access Now Easy) уређаја.\n"
 "\n"
-"Format [UREĐAJ] je ime backend-a: u obliku uređaja (n.pr. umax:/dev/"
-"scanner)\n"
-"[OPCIJA]... može biti kombinacija sledećih stavki:\n"
-" -h, --help                   pokaži ovaj pomoćni i tekst\n"
-" -v, --version                daj informacije o verziji\n"
-" -l, --license                daj ifnormacije o licenci\n"
+"Формат од [DEVICE] је име додатка:фајла-уређаја (нпр. umax:/dev/scanner\n"
+"[OPTION]... може бити комбинација од следећих ставки\n"
+" -h, --help                   покажи текст за помоћ и изађи\n"
+" -v, --version                дај информацију о верзији\n"
+" -l, --license                дај информацију о лиценци\n"
 "\n"
-" -d, --device-settings fajl   učitaj podešavanja uređaja iz fajla (bez "
-"nastavka \".drc\")\n"
+" -d, --device-settings фајла   учитај подешавања уређаја из фајле (без \".drc"
+"\")\n"
 "\n"
-" -s, --save                   startaj u modusu za upisivanje\n"
-" -V, --viewer                 startaj u modusu za prikazivanje\n"
-" -c, --copy                   startaj u modusu za kopiranje\n"
-" -f, --fax                    startaj u modusu za slanje faksa\n"
-" -m, --mail                   startaj u modusu za e-poštu\n"
-" -n, --no-mode-selection      onemogući izbor modusa\n"
+" -V, --viewer                 стартај у модусу за приказивање (default)\n"
+" -s, --save                   стартај у модусу за памћење\n"
+" -c, --copy                   стартај у модусу зс копирање\n"
+" -m, --multipage              стартај у mnogostrukom модусу\n"
+" -f, --fax                    стартај у модусу за факс\n"
+" -e, --email                  стартај у модусу за електронску пошту\n"
+" -n, --no-mode-selection      искључи мени за XSane модус бирања\n"
 "\n"
-" -F, --Fixed                  glavni prozor je stalne veličine (prepiši "
-"podešavanja)\n"
-" -R, --Resizeable             glavni prozor je promenljiv (prepiši "
-"podešavanja)\n"
+" -F, --Fixed                  главни прозор је фиксне величине (препиши "
+"вредности подешавања)\n"
+" -R, --Resizeable             главни прозор је променљив (препиши вредности "
+"подешавања)\n"
 "\n"
-" -p, --print-filenames        prikaži nazive fajla napravljene od XSane-a\n"
-" -N, --force-filename name    koristi naziv kao naziv fajla i onemogući "
-"korisniku izbor                               naziva fajla\n"
+" -p, --print-filenames        прикажи називе фајли направљених од XSane\n"
+" -N, --force-filename name    користи назив као име фајле и онемогући "
+"кориснику избор назива фајле\n"
 "\n"
-" --display X11-display        prebaci izlaz na X11-prikaz\n"
-" --no-xshm                    ne koristi slike koje se dele sa više "
-"korisnika\n"
-" --sync                       zahtevaj sihronu vezu sa X11 serverom"
+" --display X11-display        пребаци излаз на X11 приказ\n"
+" --no-xshm                    не користи слике које користе дељену меморију\n"
+" --sync                       захтевај синхрону везу са X11 сервером"
 
 #. strings for gimp plugin
 #. XSANE_GIMP_INSTALL_BLURB
 msgid "Front-end to the SANE interface"
-msgstr "Grafički posrednik do SANE intefejsa"
+msgstr "Графички посредник до SANE интерфејса"
 
 #. XSANE_GIMP_INSTALL_HELP
 msgid ""
 "This function provides access to scanners and other image acquisition "
 "devices through the SANE (Scanner Access Now Easy) interface."
 msgstr ""
-"Ta funkcija omogućava dostup do skenera i drugih uređaja za dobijanje slika "
-"pomoću SANE-a (Sccanner Access Now Easy) interfejsa."
+"Та функција омогућава доступ до скенера и других уређаја за добијање слика "
+"помоћу SANE (Scanner Access Now Easy) интерфејса."
 
 #. Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/"
 #. XSANE_GIMP_MENU_DIALOG
 msgid "<Toolbox>/File/Acquire/XSane: Device dialog..."
-msgstr "<Toolbox>/File/Acquire/XSane: Izbor uređaja..."
+msgstr "<Toolbox>/File/Acquire/XSane: Избор уређаја..."
 
 #. XSANE_GIMP_MENU
 msgid "<Toolbox>/File/Acquire/XSane: "
@@ -3006,7 +2933,7 @@ msgstr "<Toolbox>/File/Acquire/XSane:"
 
 #. XSANE_GIMP_MENU_DIALOG_OLD
 msgid "<Toolbox>/Xtns/XSane/Device dialog..."
-msgstr "<Toolbox>/Xtns/XSane/Izbor uređaja..."
+msgstr "<Toolbox>/Xtns/XSane/Избор уређаја..."
 
 #. XSANE_GIMP_MENU_OLD
 msgid "<Toolbox>/Xtns/XSane/"
@@ -3020,39 +2947,46 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
+"Могући узроци:\n"
+"1) Стварно није уређај који је подржан од SANE\n"
+"2) Подржани уређаји су заузети\n"
+"3) Дозволе фајли уређаја не дозвољавају да их користите, покушајте као root\n"
+"4) Додатак није подигнут од SANE (man sane-dll)\n"
+"5) Додатак није исправно конфигурисан (man sane-\"backendname\")\n"
+"6) Могуће да je инстaлисанo више верзија SANE"
 
 #. strings that are used in structures, so it is not allowed to use _()/gettext() here
 #. gettext_noop does mark these texts but does not change the string
 #. MENU_ITEM_SURFACE_FULL_SIZE
 msgid "full size"
-msgstr "cela strana"
+msgstr "пуна величина"
 
 #. MENU_ITEM_SURFACE_DIN_A3P
 msgid "DIN A3 port."
-msgstr "uspravno A3"
+msgstr "DIN A3 усправно"
 
 #. MENU_ITEM_SURFACE_DIN_A3L
 msgid "DIN A3 land."
-msgstr "vodoravno A3"
+msgstr "DIN A3 попречно"
 
 #. MENU_ITEM_SURFACE_DIN_A4P
 msgid "DIN A4 port."
-msgstr "uspravno A4"
+msgstr "DIN A4 усправно"
 
 #. MENU_ITEM_SURFACE_DIN_A4L
 msgid "DIN A4 land."
-msgstr "vodoravno A4"
+msgstr "DIN A4 попречно"
 
 #. MENU_ITEM_SURFACE_DIN_A5P
 msgid "DIN A5 port."
-msgstr "uspravno A5"
+msgstr "DIN A5 усправно"
 
 #. MENU_ITEM_SURFACE_DIN_A5L
 msgid "DIN A5 land."
-msgstr "vodoravno A5"
+msgstr "DIN A5 попречно"
 
 #. MENU_ITEM_SURFACE_13cmx18cm
 msgid "13cm x 18cm"
@@ -3080,344 +3014,191 @@ msgstr "13 cm x 9 cm"
 
 #. MENU_ITEM_SURFACE_legal_P
 msgid "legal port."
-msgstr "uspravno legal"
+msgstr "legal усправно"
 
 #. MENU_ITEM_SURFACE_legal_L
 msgid "legal land."
-msgstr "vodoravno legal"
+msgstr "legal попречно"
 
 #. MENU_ITEM_SURFACE_letter_P
 msgid "letter port."
-msgstr "uspravno letter"
+msgstr "letter усправно"
 
 #. MENU_ITEM_SURFACE_letter_L
 msgid "letter land."
-msgstr "vodoravno letter"
+msgstr "letter попречно"
 
 #. MENU_ITEM_MEDIUM_FULL_COLOR_RANGE
-#, fuzzy
 msgid "Full color range"
-msgstr "pun opseg"
+msgstr "Пун опсег боја"
 
 #. MENU_ITEM_MEDIUM_SLIDE
 msgid "Slide"
-msgstr "Dia"
+msgstr "Диапозитив"
 
 #. MENU_ITEM_MEDIUM_STANDARD_NEG
 msgid "Standard negative"
-msgstr "Standardni negativ"
+msgstr "Стандардни негатив"
 
 #. MENU_ITEM_MEDIUM_AGFA_NEG
 msgid "Agfa negative"
-msgstr "Agfa negativ"
+msgstr "Agfa негатив"
 
 #. MENU_ITEM_MEDIUM_AGFA_NEG_XRG200_4
-#, fuzzy
 msgid "Agfa negative XRG 200-4"
-msgstr "Agfa negativ"
+msgstr "Agfa негатив XRG 200-4"
 
 #. MENU_ITEM_MEDIUM_AGFA_NEG_HDC_100
-#, fuzzy
 msgid "Agfa negative HDC 100"
-msgstr "Agfa negativ"
+msgstr "Agfa негатив HDC 100"
 
 #. MENU_ITEM_MEDIUM_FUJI_NEG
 msgid "Fuji negative"
-msgstr "Fuji negativ"
+msgstr "Fuji негатив"
 
 #. MENU_ITEM_MEDIUM_KODAK_NEG
 msgid "Kodak negative"
-msgstr "Kodak negativ"
+msgstr "Kodak негатив"
 
 #. MENU_ITEM_MEDIUM_KONICA_NEG
 msgid "Konica negative"
-msgstr "Konica negativ"
+msgstr "Konica негатив"
 
 #. MENU_ITEM_MEDIUM_KONICA_NEG_VX_100
-#, fuzzy
 msgid "Konica negative VX 100"
-msgstr "Konica negativ"
+msgstr "Konica негатив VX 100"
 
 #. MENU_ITEM_MEDIUM_ROSSMANN_NEG_HR_100
 msgid "Rossmann negative HR 100"
-msgstr ""
+msgstr "Rossmann негатив HR 100"
 
 #. TEXT_PROJECT_STATUS_NOT_CREATED
-#, fuzzy
 msgid "Project not created"
-msgstr "čitati"
+msgstr "Пројект није направљен"
 
 #. TEXT_PROJECT_STATUS_CREATED
-#, fuzzy
 msgid "Project created"
-msgstr "čitati"
+msgstr "Пројект је направљен"
 
 #. TEXT_PROJECT_STATUS_CHANGED
-#, fuzzy
 msgid "Project changed"
-msgstr "Automatsko biranje površine skeniranja"
+msgstr "Пројект је промењен"
 
 #. TEXT_PROJECT_STATUS_ERR_READ_PROJECT
-#, fuzzy
 msgid "Error reading project"
-msgstr "Unesi ime projekta za E-poštu"
+msgstr "Грешка при читању пројекта"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING_ERROR
-#, fuzzy
 msgid "Error saving file"
-msgstr "Sliku zapamtiti"
+msgstr "Грешка при памћењу слике"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING
-#, fuzzy
 msgid "Saving file"
-msgstr "Sliku zapamtiti"
+msgstr "Запамтити слику"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVING_ABORTED
-#, fuzzy
 msgid "Aborted saving file"
-msgstr "Sliku zapamtiti"
+msgstr "Памћење слике је прекинуто"
 
 #. TEXT_PROJECT_STATUS_FILE_SAVED
 msgid "File has been saved"
-msgstr ""
+msgstr "Фајла је запамћена"
 
 #. TEXT_EMAIL_STATUS_POP3_CONNECTION_FAILED
 msgid "POP3 connection failed"
-msgstr ""
+msgstr "POP3 повезивање није успело"
 
 #. TEXT_EMAIL_STATUS_POP3_LOGIN_FAILED
 msgid "POP3 login failed"
-msgstr ""
+msgstr "POP3 пријава није успела"
 
 #. TEXT_EMAIL_STATUS_ASMTP_AUTH_FAILED
-#, fuzzy
 msgid "ASMTP authentication failed"
-msgstr "POP3 autentifikacija"
+msgstr "ASMTP аутентификација није успела"
 
 #. TEXT_EMAIL_STATUS_SMTP_CONNECTION_FAILED
 msgid "SMTP connection failed"
-msgstr ""
+msgstr "SMTP повезивање није успело"
 
 #. TEXT_EMAIL_STATUS_SMTP_ERR_FROM
-#, fuzzy
 msgid "From entry not accepted"
-msgstr "čitati"
+msgstr "Унос пошиљаоца није дозвољен"
 
 #. TEXT_EMAIL_STATUS_SMTP_ERR_RCPT
-#, fuzzy
 msgid "Receiver entry not accepted"
-msgstr "čitati"
+msgstr "Унос пријемника није прихваћен"
 
 #. TEXT_EMAIL_STATUS_SMTP_ERR_DATA
-#, fuzzy
 msgid "E-mail data not accepted"
-msgstr "čitati"
+msgstr "Податци е-поште нису прихваћени"
 
 #. TEXT_EMAIL_STATUS_SENDING
 msgid "Sending e-mail"
-msgstr ""
+msgstr "Слање е-поште"
 
 #. TEXT_EMAIL_STATUS_SENT
 msgid "E-mail has been sent"
-msgstr ""
+msgstr "Е-пошта је послана"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
-msgstr ""
+msgid "Queueing fax"
+msgstr "Ставити факс у ред за чекање"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
 msgid "Fax is queued"
-msgstr ""
+msgstr "Факс је у реду за чекање"
 
 #. Sane backend messages
 msgid "flatbed scanner"
-msgstr "ravni skener"
+msgstr "равни скенер"
 
 msgid "frame grabber"
-msgstr "okvirni snimač"
+msgstr "оквирни снимач"
 
 msgid "handheld scanner"
-msgstr "ručni skener"
+msgstr "ручни скенер"
 
 msgid "still camera"
-msgstr "fotoaparat"
+msgstr "фотоапарат"
 
 msgid "video camera"
-msgstr "videokamera"
+msgstr "видеокамера"
 
 msgid "virtual device"
-msgstr "virtualni uređaj"
+msgstr "виртуални уређај"
 
 msgid "Success"
-msgstr "Uspešno"
+msgstr "Успешно"
 
 msgid "Operation not supported"
-msgstr "Operacija nije podržana"
+msgstr "Операција није подржана"
 
 msgid "Operation was cancelled"
-msgstr "Operacija je bila prekinuta"
+msgstr "Операција је била прекинута"
 
 msgid "Device busy"
-msgstr "Uređaj je zauzet"
+msgstr "Уређај је заузет"
 
 msgid "Invalid argument"
-msgstr "Pogrešan argument"
+msgstr "Погрешан аргумент"
 
 msgid "End of file reached"
-msgstr "Dostignut je kraj fajla"
+msgstr "Достигнут је крај фајле"
 
 msgid "Document feeder jammed"
-msgstr "Zastoj u magazinu dokumenata"
+msgstr "Застој у магазину докумената"
 
 msgid "Document feeder out of documents"
-msgstr "Magazin dokumenta je prazan"
+msgstr "Магазин докумената је празан"
 
 msgid "Scanner cover is open"
-msgstr "Kućište skenera je otvoreno"
+msgstr "Кућиште скенера је отворено"
 
 msgid "Error during device I/O"
-msgstr "I/O greška na uređaju"
+msgstr "I/O грешка на уређају"
 
 msgid "Out of memory"
-msgstr "Nedostatak memorije"
+msgstr "Недостатак меморије"
 
 msgid "Access to resource has been denied"
-msgstr "Dostup do resursa nije dozvoljen"
-
-#, fuzzy
-#~ msgid "select scanner transmissive ICM-profile"
-#~ msgstr "Odstrani štampač"
-
-#, fuzzy
-#~ msgid "select scanner transmissive gray ICM-profile"
-#~ msgstr "Odstrani štampač"
-
-#, fuzzy
-#~ msgid "Scanner reflective ICM-profile"
-#~ msgstr "Odstrani štampač"
-
-#, fuzzy
-#~ msgid "Scanner reflective gray ICM-profile"
-#~ msgstr "Odstrani štampač"
-
-#, fuzzy
-#~ msgid "Scanner transmissive gray ICM-profile"
-#~ msgstr "Odstrani štampač"
-
-#, fuzzy
-#~ msgid "Scanner reflektive ICM-profile"
-#~ msgstr "Odstrani štampač"
-
-#, fuzzy
-#~ msgid "Browse for scanner transmissive ICM-profile"
-#~ msgstr "Traži slike po nazivima fajla"
-
-#, fuzzy
-#~ msgid "Browse for scanner transmissive gray ICM-profile"
-#~ msgstr "Traži slike po nazivima fajla"
-
-#~ msgid "GIMP can't handle depth %d bits/color"
-#~ msgstr "GIMP ne može podržati dubinu od %d bit-a u boji"
-
-#, fuzzy
-#~ msgid "scanner reflective ICM profile"
-#~ msgstr "Odstrani štampač"
-
-#, fuzzy
-#~ msgid "Embed scanner/source ICM profile for GIMP"
-#~ msgstr "Odstrani štampač"
-
-#~ msgid "Enter name of fax project"
-#~ msgstr "Unesi ime projekta za faks"
-
-#, fuzzy
-#~ msgid "Enter name of e-mail project"
-#~ msgstr "Unesi ime projekta za E-poštu"
-
-#, fuzzy
-#~ msgid "Enter name of multipage project"
-#~ msgstr "Unesi ime projekta za E-poštu"
-
-#~ msgid ""
-#~ "Gimp does not support depth 16 bits/color.\n"
-#~ "Do you want to reduce the depth to 8 bits/color?"
-#~ msgstr ""
-#~ "Gimp ne podržava dubinu 16 bit-a u boji.\n"
-#~ "Da li želite da smanjite dubinu na 8 bit-a u boji?"
-
-#, fuzzy
-#~ msgid "POP3 authentication"
-#~ msgstr "POP3 autentifikacija"
-
-#~ msgid "XSane mode"
-#~ msgstr "Način rada XSane"
-
-#~ msgid "POP3 user:"
-#~ msgstr "POP3 korisnik:"
-
-#~ msgid "POP3 password:"
-#~ msgstr "POP3 lozinka:"
-
-#~ msgid "Automatic Document Feeder Modus:"
-#~ msgstr "Automatsko uvlačenje dokumenata:"
-
-#~ msgid ""
-#~ "Select scansource for Automatic Document feeder. If this scansource is "
-#~ "selected XSane scans until \"out of paper\" or error."
-#~ msgstr ""
-#~ "Odredi izvor skeniranja za automatsko dodavanje dokumenata. Ako je taj "
-#~ "izvor izabran onda Xsane skenira do obaveštenja \"out of paper\" ili "
-#~ "dogreške."
-
-#, fuzzy
-#~ msgid "E-mail project not created"
-#~ msgstr "čitati"
-
-#, fuzzy
-#~ msgid "E-mail project created"
-#~ msgstr "čitati"
-
-#, fuzzy
-#~ msgid "E-mail project changed"
-#~ msgstr "Automatsko biranje površine skeniranja"
-
-#, fuzzy
-#~ msgid "Multipage project not created"
-#~ msgstr "čitati"
-
-#, fuzzy
-#~ msgid "Multipage project created"
-#~ msgstr "čitati"
-
-#, fuzzy
-#~ msgid "Multipage project changed"
-#~ msgstr "Automatsko biranje površine skeniranja"
-
-#, fuzzy
-#~ msgid "Error reading multipage project"
-#~ msgstr "Unesi ime projekta za E-poštu"
-
-#, fuzzy
-#~ msgid "Saving multipage file"
-#~ msgstr "Sliku zapamtiti"
-
-#, fuzzy
-#~ msgid "Multipage saving aborted"
-#~ msgstr "čitati"
-
-#~ msgid "Viewer (png):"
-#~ msgstr "Prikazivač (png):"
-
-#, fuzzy
-#~ msgid "Enter command to be executed to view an e-mail image"
-#~ msgstr "Komanda za prikaz slike iz e-pošte"
-
-#, fuzzy
-#~ msgid "Failed to execute e-mail image viewer:"
-#~ msgstr "Greška pri izvršenju prikazivača e-pošte:"
-
-#~ msgid "Step"
-#~ msgstr "Korak"
-
-#~ msgid "Mail"
-#~ msgstr "E-pošta:"
+msgstr "Доступ до ресурса није дозвољен"
diff --git a/po/sv.gmo b/po/sv.gmo
index 0ea97fd..500dc3a 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 2c0fe9c..832e03e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2003-08-03 14:12+01:00\n"
 "Last-Translator: Johan Bengtsson <jb@goteborg.bostream.se>\n"
 "Language-Team: LANGUAGE <sv@li.org>\n"
@@ -83,7 +83,8 @@ msgid "rename fax page"
 msgstr "byt namn på faxsida"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "infoga ps-fil i fax"
 
 #. WINDOW_EMAIL_PROJECT
@@ -516,7 +517,7 @@ msgid "Skip existing filenames"
 msgstr "Hoppa över existerande filnamn"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -524,7 +525,8 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Spara 16bits pnm i ascii format"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -548,8 +550,9 @@ msgstr "Använd egen färgpalett"
 msgid "Autoenhance gamma"
 msgstr "Automatisk gammainställning"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Förval av inläsningsyta"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -573,10 +576,6 @@ msgstr "Letar efter enheter..."
 msgid "Available devices:"
 msgstr "Tillgängliga enheter:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "XSane-inställningar"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Typ"
@@ -905,53 +904,72 @@ msgstr "Kommando:"
 msgid "Copy number option:"
 msgstr "Flagga för kopienummer:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Ställ in bildläsarupplösning"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Upplösning i grafikläge (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Upplösning i svartvit läge (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Upplösning i färgläge (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Bredd"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Höjd"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Vänster marginal"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Marginal från botten"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Skrivargamma röd:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Skrivarens gammavärde:"
+#, fuzzy
+msgid "common value"
+msgstr "Senaste värden:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Skrivargamma röd:"
+#, fuzzy
+msgid "red"
+msgstr "läs"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Skrivargamma grön:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Skrivargamma blå:"
+#, fuzzy
+msgid "blue"
+msgstr "Sudda till"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -968,7 +986,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1092,8 +1110,24 @@ msgstr "Sätt standardinställningar för:"
 msgid "Viewer (Postscript):"
 msgstr "Visare (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Bredd"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Höjd"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Vänster marginal"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Marginal från botten"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1465,11 +1499,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "CCITT 1D Huffmankompression"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "CCITT Grupp 3 faxkompression"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "CCITT Grupp 4 faxkompression"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1603,8 +1639,9 @@ msgstr "Tar emot %s data"
 msgid "page"
 msgstr "paket"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "För över bild"
 
 #. PROGRESS_ROTATING_DATA
@@ -1680,7 +1717,7 @@ msgstr ""
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2032,13 +2069,15 @@ msgid "Browse for temporary directory"
 msgstr "Bläddra efter temporär katalog"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Kvalitet i procent om bilden sparas som jpeg eller tiff med jpeg-kompression"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Kompression om bilden sparas som png"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2047,19 +2086,22 @@ msgstr "Minimum längd för räknaren i filnamn"
 
 #. DESC_TIFF_ZIP_COMPRESSION
 #, fuzzy
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Kompressionstyp om 8-bits bild sparas som tiff"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Kompressionstyp om 16-bits bild sparas som tiff"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Kompressionstyp om 8-bits bild sparas som tiff"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Kompressionstyp om grafisk bild sparas som tiff"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2087,10 +2129,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "När en 16bits bild skall sparas i pnm format använd då asciii format "
@@ -2150,7 +2193,8 @@ msgid "Select how a range is displayed"
 msgstr "Välj hur ett omfång visas"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr ""
 "Värde som den kalkylerade förhandsgranskningsupplösningen multipliceras med"
 
@@ -2220,8 +2264,9 @@ msgstr ""
 "standarvärde"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Skriv in det kommando som köras för att visa hjälpfiler, det måste vara ett "
 "program som kan visa htmlfiler!"
@@ -2230,8 +2275,9 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Ändra gammavärde när autoexponeringsknappen används"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "Välj inläsningsområde efter förhandsgranskningen är klar"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2322,28 +2368,33 @@ msgstr "port som kopplar upp mot POP3 server"
 
 #. DESC_HTML_EMAIL
 #, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "Post sänds i htmlläge, bilder visas direkt"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "Skriv in kommando som startar ocrprogram"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Skriv in den flagga som definierar inmatingsfilen för ocrprogrammet"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Skriv in den flagga som definierar utmatingsfilen för ocrprogrammet"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Definiera om ocrprogrammet stöder gui statuslinje"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr "Skriv in ocrprogrammets flagga för utmatingsfildeskriptor i GUI läge"
 
 #. DESC_OCR_PROGRESS_KEYWORD
@@ -2380,7 +2431,8 @@ msgid "Pick black point"
 msgstr "Välj svartpunkt"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Använd hela inläsningsområdet"
 
 #. DESC_ZOOM_OUT
@@ -2404,12 +2456,14 @@ msgstr "Ångra senaste zoomningen"
 msgid "Select visible area"
 msgstr "Markera det synliga området"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Automatisk val av inläsningsyta"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Höj inläsningsyta automatiskt"
 
 #. DESC_DELETE_IMAGES
@@ -2419,7 +2473,7 @@ msgstr "Ta bort förhandsgransknings bildcache"
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 
@@ -2449,15 +2503,18 @@ msgid "Clone image"
 msgstr "Klona bild"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Rotera bild 90 grader"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Rotera bild 180 grader"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Rotera bild 270 grader"
 
 #. DESC_MIRROR_X
@@ -2493,11 +2550,13 @@ msgid "Y-Scale factor"
 msgstr "Y-Skale faktor"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Skala bild till bredd [i pixlar]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Skala bild till höjd [i pixlar]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2619,7 +2678,8 @@ msgid "Failed to open"
 msgstr "Kunde inte öppna"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Kunde inte skapa en säker fil (kanske en länk existerar):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2696,8 +2756,9 @@ msgid "Failed to execute fax command:"
 msgstr "Kunde inte exekvera faxkommando:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Kunde inte exekvera ocrkommando:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Kunde inte exekvera faxkommando:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2757,11 +2818,12 @@ msgid "warning: option has no value constraint"
 msgstr "varning: alternativet har ingen värdebegränsning"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Du kan försöka köra XSane som root, men det är FARLIGT!\n"
@@ -3013,6 +3075,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Toolbox>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -3020,7 +3083,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Möjliga orsaker:\n"
@@ -3226,7 +3289,7 @@ msgid "E-mail has been sent"
 msgstr ""
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+msgid "Queueing fax"
 msgstr ""
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3288,6 +3351,24 @@ msgstr "Slut på minne"
 msgid "Access to resource has been denied"
 msgstr "Tillgång till resurs nekas"
 
+#~ msgid "XSane options"
+#~ msgstr "XSane-inställningar"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Kunde inte exekvera ocrkommando:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Upplösning i färgläge (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Skrivarens gammavärde:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Skrivargamma grön:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Skrivargamma blå:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Ta bort skrivare"
diff --git a/po/tr.gmo b/po/tr.gmo
index f2cabf5..e203ed2 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index c1ade91..70585cc 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xsane_tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2005-12-22 10:01+0100\n"
 "Last-Translator: Togan Muftuoglu <toganm@yahoo.com>\n"
 "Language-Team: Turkish <kde-i18n-tr@kde.org>\n"
@@ -86,7 +86,8 @@ msgid "rename fax page"
 msgstr "fax sayfasını yeniden isimlendir"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "ps-dosyasını faxa yerleştirin"
 
 #. WINDOW_EMAIL_PROJECT
@@ -505,7 +506,8 @@ msgid "Skip existing filenames"
 msgstr "Varolan dosya isimlerini atla"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+#, fuzzy
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr "Postscript dosyayı zlib sıkıştırmalı kaydet (ps 3 seviyesinde)"
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -513,7 +515,8 @@ msgid "Save PDF zlib compressed"
 msgstr "PDF dosyayı zlib sıkıştırmalı kaydet"
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "16bit pnm'yi ascii formatında sakla"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -537,8 +540,9 @@ msgstr "Özel renk tablosu kullan"
 msgid "Autoenhance gamma"
 msgstr "Gamma otomatik düzenlensin"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Tarama alanını önceden seç"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -562,10 +566,6 @@ msgstr "aygıtları arıyor"
 msgid "Available devices:"
 msgstr "Varolan aygıtlar"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Xsane seçenekleri"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Tip"
@@ -890,53 +890,72 @@ msgstr "Komut:"
 msgid "Copy number option:"
 msgstr "Kopyalanacak sayı seçeneği:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Tarama çözünürlüğünü ayarla"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Lineart çözünürlük (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Grayscale çözünürlük (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Renkli çözünürlük (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "En "
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Yükseklik"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Sol boşluk "
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Alt boşluk "
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Yazıcı kırmızı gamma: "
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Yazıcı gamma değeri"
+#, fuzzy
+msgid "common value"
+msgstr "Son değerler:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Yazıcı kırmızı gamma: "
+#, fuzzy
+msgid "red"
+msgstr "okuma"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Yazıcı mavi gamma:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Yazıcı mavi gamma:"
+#, fuzzy
+msgid "blue"
+msgstr "Bulanıklaştırma"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -953,7 +972,8 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 "Yazdırmak için zlib sıkıştırılmış postscript (ps 3. seviye) resim yarat "
 
@@ -1077,8 +1097,25 @@ msgstr "Program öntanımlılarını belirle:"
 msgid "Viewer (Postscript):"
 msgstr "İzleyici (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "En "
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Yükseklik"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Sol boşluk "
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Alt boşluk "
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+#, fuzzy
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr "Faks için zlib sıkıştırılmış postscript (ps 3. seviye) resim yarat "
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1448,11 +1485,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "CCITT 1D Huffman sıkıştırması"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "CCITT Grup 3 Faks sıkıştırması"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "CCITT Grup 4 Faks sıkıştırması"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1579,8 +1618,9 @@ msgstr "%s data alıyor"
 msgid "page"
 msgstr "sayfa"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Resmi aktarıyor"
 
 #. PROGRESS_ROTATING_DATA
@@ -1653,9 +1693,10 @@ msgstr ""
 "<Ctrl-f> veya email-<Ctrl-e>"
 
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2011,14 +2052,16 @@ msgid "Browse for temporary directory"
 msgstr "Geçici dizine göz at"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Eğer jpeg veya jpeg sıkıştırmalı tiff olarak saklanacaksa, resmin yüzde "
 "olarak kalitesi"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Eğer resim png olarak saklanırsa sıkıştırma"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2026,19 +2069,23 @@ msgid "Minimum length of counter in filename"
 msgstr "Dosya adı sayacının mimum uzunluğu"
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+#, fuzzy
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Zip sıkıştırmalı tiff sıkıştırma oranı (indirgeme)"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Eğer 16 bit resim tiff olarak saklanacaksa sıkıştırma tipi"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Eğer 8 bit resim tiff olarak saklanacaksa sıkıştırma tipi"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Eğer lineart resim tiff olarak saklanacaksa sıkıştırma tipi"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2072,10 +2119,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr "PDF dosyayı zlib algoritması ile sıkıştır (indirge)"
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "16 bitlik resim pnm formatında saklanacağı zaman binary formatı yerine ascii "
@@ -2132,7 +2180,8 @@ msgid "Select how a range is displayed"
 msgstr "Aralığın nasıl gösterileceğini seçin"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Hesaplanmış önizleme çözünürlüğünün çarpıldığı değer "
 
 #. DESC_PREVIEW_GAMMA
@@ -2195,8 +2244,9 @@ msgid "dimension of square that is used to average color for pipette function"
 msgstr "Pipette fonksiyonu için ortalama renkte kullanılan karenin boyutları"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "yardım dosyalarını göstermek için çalıştırılacak komutu girin, html-"
 "göstericisi olmalıdır!"
@@ -2205,8 +2255,9 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "otomatik geliştirme tuşuna basılınca gamma değerini değiştir"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "Önizleme taraması tamamlandıktan sonra tarama aranını seç"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2295,29 +2346,35 @@ msgid "port to connect to POP3 server"
 msgstr "POP3 sunusunda bağlanılacak port"
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+#, fuzzy
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "E-Posta HTML olarak yollandı, resmi yerleştirmek için :<IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "OCR prograrımın başlatmak için komutu girin"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Çıktı dosyası için ocr programının seçeneğini belirleyin"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Çıktı dosyası için ocr programının seçeneğini belirleyin"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr ""
 "OCR programının gui ilerleme çubuğunu destekleyip desteklemediğini tanımlayın"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Çıktı dosyası tanımı için ocr programının seçeneğini GUI konumunda belirleyin"
 
@@ -2356,7 +2413,8 @@ msgid "Pick black point"
 msgstr "Siyah nokta seç"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Tüm tarama alanını kullan"
 
 #. DESC_ZOOM_OUT
@@ -2380,12 +2438,14 @@ msgstr "Son zumu geri al"
 msgid "Select visible area"
 msgstr "Görülen alanı belirleyin"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Tarama alanını otomatik seç"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Tarama alanını otomatik olarak öne çıkar"
 
 #. DESC_DELETE_IMAGES
@@ -2393,9 +2453,10 @@ msgid "Delete preview image cache"
 msgstr "Önizleme resim kaşesini sil"
 
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Öntanımlı alan: \n"
@@ -2427,15 +2488,18 @@ msgid "Clone image"
 msgstr "Resmi çoğalt"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Resmi 90 derece döndür"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Resmi 180 derece döndür"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Resmi 270 derece döndür"
 
 #. DESC_MIRROR_X
@@ -2471,11 +2535,13 @@ msgid "Y-Scale factor"
 msgstr "Y ölçek çarpanı"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Resmin enini boyutlandır [piksel olarak]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Resmin yüksekliğini boyutlandır [piksel olarak]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2597,7 +2663,8 @@ msgid "Failed to open"
 msgstr "Açmada hata"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Güvenli dosya yaratılamadı (belki bağ mevcut değil)"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2675,8 +2742,9 @@ msgid "Failed to execute fax command:"
 msgstr "faks komutunu çalıştıramadı:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "ocr komutunu çalıştıramadı:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "faks komutunu çalıştıramadı:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2736,11 +2804,12 @@ msgid "warning: option has no value constraint"
 msgstr "uyarı: seçeneğin değeri belirtilmemiş"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Xsane'ni ROOT olarak çalıştırmak istiyorsunuz, bu TEHLİKELİDİR!\n"
@@ -2992,6 +3061,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Araçkutusu>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -2999,7 +3069,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Olası nedenler: \n"
@@ -3194,7 +3264,8 @@ msgid "E-mail has been sent"
 msgstr "E-Posta gönderildi"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Faks kuyruğa alınıyor"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3256,6 +3327,24 @@ msgstr "Yetersiz hafıza"
 msgid "Access to resource has been denied"
 msgstr "Kaynağa erişim reddedildi"
 
+#~ msgid "XSane options"
+#~ msgstr "Xsane seçenekleri"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "ocr komutunu çalıştıramadı:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Renkli çözünürlük (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Yazıcı gamma değeri"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Yazıcı mavi gamma:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Yazıcı mavi gamma:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Yazıcı sil"
diff --git a/po/vi.gmo b/po/vi.gmo
index fcf1493..7761831 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index dc74e93..36ce50a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2004-08-26 23:33+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -88,7 +88,8 @@ msgid "rename fax page"
 msgstr "đổi tên trang fax"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "chèn tập tin ps vào fax"
 
 #. WINDOW_EMAIL_PROJECT
@@ -527,7 +528,7 @@ msgid "Skip existing filenames"
 msgstr "Nhảy qua các tên tập tin hiện có"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -535,7 +536,8 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "Lưu 16bit pnm theo định dạng ascii"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -559,8 +561,9 @@ msgstr "Dùng bản đồ màu riêng"
 msgid "Autoenhance gamma"
 msgstr "Tự động cải thiện gamma"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "Chọn trước vùng quét"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -584,10 +587,6 @@ msgstr "đang rà tìm thiết bị"
 msgid "Available devices:"
 msgstr "Thiết bị hiện có:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "Tùy chọn XSane"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "Loại"
@@ -916,53 +915,72 @@ msgstr "Lệnh:"
 msgid "Copy number option:"
 msgstr "Đặt số bản sao:"
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "Đặt độ phân giải khi quét"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+#, fuzzy
+msgid "lineart [dpi]"
 msgstr "Độ phân giải lineart (dpi):"
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+#, fuzzy
+msgid "grayscale [dpi]"
 msgstr "Độ phân giải cân bằng xám (dpi):"
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "Độ phân giải màu (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "Rộng"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "Cao"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "Offset trái"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "Offset đáy"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "Đỏ gamma máy in:"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "Giá trị gamma máy in:"
+#, fuzzy
+msgid "common value"
+msgstr "Giá trị hiện thời:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "Đỏ gamma máy in:"
+#, fuzzy
+msgid "red"
+msgstr "đọc"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "Xanh lá cây gamma máy in:"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "Xanh da trời gamma máy in:"
+#, fuzzy
+msgid "blue"
+msgstr "Làm mờ"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -979,7 +997,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1103,8 +1121,24 @@ msgstr "Đặt mặc định chương trình cho:"
 msgid "Viewer (Postscript):"
 msgstr "Trình xem (Postscript):"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "Rộng"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "Cao"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "Offset trái"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "Offset đáy"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1476,11 +1510,13 @@ msgid "CCITT 1D Huffman compression"
 msgstr "Nén CCITT 1D Huffman"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
 msgstr "Nén CCITT Group 3 Fax"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
 msgstr "Nén CCITT Group 4 Fax"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1614,8 +1650,9 @@ msgstr "Đang nhận dữ liệu %s"
 msgid "page"
 msgstr "gói tin"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "Đang truyền ảnh"
 
 #. PROGRESS_ROTATING_DATA
@@ -1689,9 +1726,10 @@ msgstr ""
 
 #  DESC_XSANE_MEDIUM
 #. DESC_XSANE_MEDIUM
+#, fuzzy
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2049,13 +2087,15 @@ msgid "Browse for temporary directory"
 msgstr "Duyệt tìm thư mục tạm"
 
 #. DESC_JPEG_QUALITY
+#, fuzzy
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 "Chất lượng theo phần trăm nếu ảnh được lưu là jpeg hay tiff với kiểu nén jpeg"
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "Nén nếu ảnh được lưu dạng png"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2064,19 +2104,22 @@ msgstr "Độ dài tối thiểu của bộ đếm trong tên tập tin"
 
 #. DESC_TIFF_ZIP_COMPRESSION
 #, fuzzy
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr "Kiểu nén nếu ảnh 8 bit được lưu là tiff"
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr "Kiểu nén nếu ảnh 16 bit được lưu là tiff"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr "Kiểu nén nếu ảnh 8 bit được lưu là tiff"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr "Kiểu nén nếu ảnh lineart được lưu là tiff"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -2105,10 +2148,11 @@ msgid "compress PDF image with zlib algorithm (flatedecode)."
 msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
+#, fuzzy
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 "Khi lưu ảnh 16 bit theo định dạng pnm thì sau đó dùng định dạng ascii thay "
@@ -2161,7 +2205,8 @@ msgid "Select how a range is displayed"
 msgstr "Chọn cách hiển thị một chuỗi"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+#, fuzzy
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr "Giá trị để độ phân giải xem trước đã tính toán được nhân lên"
 
 #. DESC_PREVIEW_GAMMA
@@ -2224,8 +2269,9 @@ msgid "dimension of square that is used to average color for pipette function"
 msgstr "Cạnh hình vuông được dùng để dung hòa màu cho hàm pipette"
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 "Nhập lệnh thực thi để hiển thị tập tin trợ giúp, phải là trình xem html!"
 
@@ -2233,8 +2279,9 @@ msgstr ""
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "Thay đổi giá trị gamma khi nhấn nút tự động cải thiện"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "Chọn vùng quét sau khi kết thúc việc quét xem trước"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2326,28 +2373,33 @@ msgstr "cổng nối tới máy chủ POP3"
 #  DESC_HTML_MAIL
 #. DESC_HTML_EMAIL
 #, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "Thư gửi theo phương thức HTML, thay ảnh bằng: <IMAGE>"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "nhập lệnh chạy chương trình OCR"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "Nhập tùy chọn của chương trình OCR để định ra tập tin đầu vào"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "Nhập tùy chọn của chương trình OCR để định ra tập tin đầu ra"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+#, fuzzy
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr "Định nghĩa nếu chương trình OCR hỗ trợ pipe tiến trình đồ họa"
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 "Nhập tùy chọn của chương trình OCR để định ra output filedescripor trong chế "
 "độ đồ họa"
@@ -2386,7 +2438,8 @@ msgid "Pick black point"
 msgstr "Lấy điểm đen"
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "Dùng toàn bộ vùng quét"
 
 #  DESC_ZOOM_OUT
@@ -2411,12 +2464,14 @@ msgstr "Thôi việc phóng vừa rồi"
 msgid "Select visible area"
 msgstr "Chọn vùng hiển thị"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "Tự động chọn vùng quét"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "Tự động nâng vùng quét"
 
 #. DESC_DELETE_IMAGES
@@ -2425,9 +2480,10 @@ msgstr "Xóa cache ảnh xem trước"
 
 #  DESC_PRESET_AREA
 #. DESC_PRESET_AREA
+#, fuzzy
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 "Vùng định trước:\n"
@@ -2460,15 +2516,18 @@ msgid "Clone image"
 msgstr "Sao ảnh"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "Xoay ảnh 90 độ"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "Xoay ảnh 180 độ"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "Xoay ảnh 270 độ"
 
 #. DESC_MIRROR_X
@@ -2504,11 +2563,13 @@ msgid "Y-Scale factor"
 msgstr "Tác nhân cân chỉnh Y"
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+#, fuzzy
+msgid "Scale image to width [pixels]"
 msgstr "Cân chỉnh ảnh theo chiều ngang [theo pixel]"
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+#, fuzzy
+msgid "Scale image to height [pixels]"
 msgstr "Cân chỉnh ảnh theo chiều cao [theo pixel]"
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2631,7 +2692,8 @@ msgid "Failed to open"
 msgstr "Không mở được"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "Không thể tạo tập tin bảo mật (có thể một liên kết đang tồn tại):"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2710,8 +2772,9 @@ msgid "Failed to execute fax command:"
 msgstr "Không thực thi được lệnh Fax:"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "Không thực thi được lệnh OCR:"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "Không thực thi được lệnh Fax:"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2771,11 +2834,12 @@ msgid "warning: option has no value constraint"
 msgstr "cảnh báo: tùy chọn không có tính tự chủ giá trị"
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "Bạn chạy XSane bằng ROOT, việc này rất NGUY HIỂM!\n"
@@ -3028,6 +3092,7 @@ msgid "<Toolbox>/Xtns/XSane/"
 msgstr "<Hộp công cụ>/Xtns/XSane/"
 
 #. HELP_NO_DEVICES
+#, fuzzy
 msgid ""
 "Possible reasons:\n"
 "1) There really is no device that is supported by SANE\n"
@@ -3035,7 +3100,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 "Có thể là những nguyên nhân sau:\n"
@@ -3257,7 +3322,8 @@ msgstr "Thư đã được gửi"
 
 #  TEXT_FAX_STATUS_QUEUEING_FAX
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "Xếp hàng fax"
 
 #  TEXT_FAX_STATUS_FAX_QUEUED
@@ -3320,6 +3386,24 @@ msgstr "Hết bộ nhớ"
 msgid "Access to resource has been denied"
 msgstr "Truy cập đến nguồn bị từ chối"
 
+#~ msgid "XSane options"
+#~ msgstr "Tùy chọn XSane"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "Không thực thi được lệnh OCR:"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "Độ phân giải màu (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "Giá trị gamma máy in:"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "Xanh lá cây gamma máy in:"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "Xanh da trời gamma máy in:"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "Xóa máy in"
diff --git a/po/xsane.pot b/po/xsane.pot
index 15d52ea..1fecbfd 100644
--- a/po/xsane.pot
+++ b/po/xsane.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -84,7 +84,7 @@ msgid "rename fax page"
 msgstr ""
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+msgid "insert PS-file into fax"
 msgstr ""
 
 #. WINDOW_EMAIL_PROJECT
@@ -496,7 +496,7 @@ msgid "Skip existing filenames"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -504,7 +504,7 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+msgid "Save 16bit PNM in ASCII format"
 msgstr ""
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -527,8 +527,8 @@ msgstr ""
 msgid "Autoenhance gamma"
 msgstr ""
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+msgid "Preselect scan area"
 msgstr ""
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -552,10 +552,6 @@ msgstr ""
 msgid "Available devices:"
 msgstr ""
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr ""
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr ""
@@ -852,52 +848,60 @@ msgstr ""
 msgid "Copy number option:"
 msgstr ""
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+msgid "Scan resolution:"
+msgstr ""
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+msgid "lineart [dpi]"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+msgid "grayscale [dpi]"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+msgid "width"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+msgid "height"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+msgid "left offset"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+msgid "bottom offset"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+msgid "Printer gamma:"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
+msgid "common value"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
+msgid "red"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
+msgid "green"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
+msgid "blue"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
@@ -913,7 +917,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1036,8 +1040,24 @@ msgstr ""
 msgid "Viewer (Postscript):"
 msgstr ""
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr ""
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr ""
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr ""
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr ""
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1391,11 +1411,11 @@ msgid "CCITT 1D Huffman compression"
 msgstr ""
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
+msgid "CCITT Group 3 fax compression"
 msgstr ""
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
+msgid "CCITT Group 4 fax compression"
 msgstr ""
 
 #. MENU_ITEM_TIFF_COMP_JPEG
@@ -1519,8 +1539,8 @@ msgstr ""
 msgid "page"
 msgstr ""
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+msgid "Transferring image"
 msgstr ""
 
 #. PROGRESS_ROTATING_DATA
@@ -1592,7 +1612,7 @@ msgstr ""
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -1919,11 +1939,11 @@ msgstr ""
 
 #. DESC_JPEG_QUALITY
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+msgid "Compression if image is saved as PNG"
 msgstr ""
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -1931,19 +1951,19 @@ msgid "Minimum length of counter in filename"
 msgstr ""
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr ""
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
+msgid "Compression type if 16 bit image is saved as TIFF"
 msgstr ""
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
+msgid "Compression type if 8 bit image is saved as TIFF"
 msgstr ""
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
+msgid "Compression type if lineart image is saved as TIFF"
 msgstr ""
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
@@ -1971,9 +1991,9 @@ msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 
@@ -2019,7 +2039,7 @@ msgid "Select how a range is displayed"
 msgstr ""
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr ""
 
 #. DESC_PREVIEW_GAMMA
@@ -2078,15 +2098,15 @@ msgstr ""
 
 #. DESC_DOC_VIEWER
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr ""
 
 #. DESC_AUTOENHANCE_GAMMA
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr ""
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+msgid "Select scan area after preview scan has finished"
 msgstr ""
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2170,28 +2190,28 @@ msgid "port to connect to POP3 server"
 msgstr ""
 
 #. DESC_HTML_EMAIL
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr ""
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+msgid "Enter command to start OCR program"
 msgstr ""
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+msgid "Enter option of the OCR program to define input file"
 msgstr ""
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+msgid "Enter option of the OCR program to define output file"
 msgstr ""
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr ""
 
 #. DESC_OCR_OUTFD_OPT
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
+"Enter option of the OCR program to define output filedescripor in GUI mode"
 msgstr ""
 
 #. DESC_OCR_PROGRESS_KEYWORD
@@ -2227,7 +2247,7 @@ msgid "Pick black point"
 msgstr ""
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+msgid "Use full scan area"
 msgstr ""
 
 #. DESC_ZOOM_OUT
@@ -2251,12 +2271,12 @@ msgstr ""
 msgid "Select visible area"
 msgstr ""
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+msgid "Autoselect scan area"
 msgstr ""
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+msgid "Autoraise scan area"
 msgstr ""
 
 #. DESC_DELETE_IMAGES
@@ -2266,7 +2286,7 @@ msgstr ""
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 
@@ -2295,15 +2315,15 @@ msgid "Clone image"
 msgstr ""
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+msgid "Rotate image 90 degrees"
 msgstr ""
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+msgid "Rotate image 180 degrees"
 msgstr ""
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+msgid "Rotate image 270 degrees"
 msgstr ""
 
 #. DESC_MIRROR_X
@@ -2339,11 +2359,11 @@ msgid "Y-Scale factor"
 msgstr ""
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+msgid "Scale image to width [pixels]"
 msgstr ""
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+msgid "Scale image to height [pixels]"
 msgstr ""
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2459,7 +2479,7 @@ msgid "Failed to open"
 msgstr ""
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr ""
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2535,7 +2555,7 @@ msgid "Failed to execute fax command:"
 msgstr ""
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
+msgid "Failed to execute OCR command:"
 msgstr ""
 
 #. ERR_BAD_FRAME_FORMAT
@@ -2600,7 +2620,7 @@ msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 
@@ -2810,7 +2830,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 
@@ -2997,7 +3017,7 @@ msgid "E-mail has been sent"
 msgstr ""
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+msgid "Queueing fax"
 msgstr ""
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
diff --git a/po/zh.gmo b/po/zh.gmo
index e860af8..54c873e 100644
--- a/po/zh.gmo
+++ b/po/zh.gmo
diff --git a/po/zh.po b/po/zh.po
index faf6afa..d681a5b 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2003-03-27 12:00+0100\n"
 "Last-Translator: Wang leolarrel <leolarrel@yahoo.com.tw>\n"
 "Language-Team: zh_TW<zh_TW@li.org>\n"
@@ -83,7 +83,8 @@ msgid "rename fax page"
 msgstr "更名傳真專案"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "插入ps檔案到傳真"
 
 #. WINDOW_EMAIL_PROJECT
@@ -515,7 +516,7 @@ msgid "Skip existing filenames"
 msgstr "省略已存在的檔案"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -523,7 +524,8 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "儲存16位元pnm在ascii格式"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -547,8 +549,9 @@ msgstr "使用先前的colormap"
 msgid "Autoenhance gamma"
 msgstr "自動增強gamma"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "預先選擇掃描區"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -572,10 +575,6 @@ msgstr "裝置掃描中"
 msgid "Available devices:"
 msgstr "可用的裝置有:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "XSane 選項"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "型態"
@@ -887,53 +886,70 @@ msgstr "命令"
 msgid "Copy number option:"
 msgstr ""
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "設定掃描解析度"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+msgid "lineart [dpi]"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+msgid "grayscale [dpi]"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "色彩解析度 (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "寬"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "高"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "左邊差距"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "下邊差距"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "列表機 紅色gamma"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "列表機gamma值"
+#, fuzzy
+msgid "common value"
+msgstr "最近的值:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "列表機 紅色gamma"
+#, fuzzy
+msgid "red"
+msgstr "讀取"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "列表機 綠色gamma"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "列表機 藍色gamma"
+#, fuzzy
+msgid "blue"
+msgstr "模糊"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -950,7 +966,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1074,8 +1090,24 @@ msgstr ""
 msgid "Viewer (Postscript):"
 msgstr "檢視器(Postscript)"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "寬"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "高"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "左邊差距"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "下邊差距"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1449,12 +1481,14 @@ msgid "CCITT 1D Huffman compression"
 msgstr ""
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
-msgstr ""
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
+msgstr "不壓縮"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
-msgstr ""
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
+msgstr "不壓縮"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
 msgid "JPEG DCT compression"
@@ -1587,8 +1621,9 @@ msgstr "接收%s資料"
 msgid "page"
 msgstr "包裝"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "傳輸影像中"
 
 #. PROGRESS_ROTATING_DATA
@@ -1661,7 +1696,7 @@ msgstr ""
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -2003,11 +2038,12 @@ msgstr "暫存目錄瀏覽"
 
 #. DESC_JPEG_QUALITY
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "如果存成png檔的話,就壓縮"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -2015,20 +2051,23 @@ msgid "Minimum length of counter in filename"
 msgstr ""
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr ""
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
-msgstr ""
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
+msgstr "如果存成png檔的話,就壓縮"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
-msgstr ""
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
+msgstr "如果存成png檔的話,就壓縮"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
-msgstr ""
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
+msgstr "如果存成png檔的話,就壓縮"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device dependant preferences in default file at exit of xsane"
@@ -2055,9 +2094,9 @@ msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 
@@ -2104,7 +2143,7 @@ msgid "Select how a range is displayed"
 msgstr "選擇一個區域如何被顯示"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr ""
 
 #. DESC_PREVIEW_GAMMA
@@ -2162,16 +2201,18 @@ msgid "dimension of square that is used to average color for pipette function"
 msgstr ""
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr "輸入顯示救助檔時要被執行的命令,必須是一個html檢視器"
 
 #. DESC_AUTOENHANCE_GAMMA
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "更改gamma值如果自動增強按鈕被按下時"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "預覽掃描後選擇掃描區已經完成了"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2261,29 +2302,33 @@ msgstr ""
 #
 #. DESC_HTML_EMAIL
 #, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "郵件以HTML傳送,影像直接顯示"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "輸入開始OCR程式要執行的指令"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "輸入OCR程式的選項給定義的輸入檔"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "輸入OCR程式的選項給定義的輸出檔"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr ""
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
-msgstr ""
+"Enter option of the OCR program to define output filedescripor in GUI mode"
+msgstr "輸入OCR程式的選項給定義的輸出檔"
 
 #. DESC_OCR_PROGRESS_KEYWORD
 msgid "Define Keyword that is used to mark progress information"
@@ -2319,7 +2364,8 @@ msgid "Pick black point"
 msgstr ""
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "使用全部掃描區"
 
 #. DESC_ZOOM_OUT
@@ -2343,12 +2389,14 @@ msgstr ""
 msgid "Select visible area"
 msgstr "選擇顯示區"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "自動選掃描區"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "自動更改掃描區大小"
 
 #. DESC_DELETE_IMAGES
@@ -2358,7 +2406,7 @@ msgstr "刪除預覽影像快取"
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 
@@ -2387,15 +2435,18 @@ msgid "Clone image"
 msgstr "複製影像"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "翻轉影像90度"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "翻轉影像180度"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "翻轉影像270度"
 
 #. DESC_MIRROR_X
@@ -2431,11 +2482,11 @@ msgid "Y-Scale factor"
 msgstr ""
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+msgid "Scale image to width [pixels]"
 msgstr ""
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+msgid "Scale image to height [pixels]"
 msgstr ""
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2557,7 +2608,8 @@ msgid "Failed to open"
 msgstr "開啟失敗"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "不能建立安全檔(可能連結已經存在)"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2633,8 +2685,9 @@ msgid "Failed to execute fax command:"
 msgstr "不能執行傳真命令"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "不能執行ocr命令"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "不能執行傳真命令"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2698,7 +2751,7 @@ msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 
@@ -2918,7 +2971,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 
@@ -3119,7 +3172,7 @@ msgid "E-mail has been sent"
 msgstr ""
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+msgid "Queueing fax"
 msgstr ""
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3181,6 +3234,24 @@ msgstr "記憶體不足"
 msgid "Access to resource has been denied"
 msgstr "資源存取被禁止"
 
+#~ msgid "XSane options"
+#~ msgstr "XSane 選項"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "不能執行ocr命令"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "色彩解析度 (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "列表機gamma值"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "列表機 綠色gamma"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "列表機 藍色gamma"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "刪除列表機"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 5880d10..633a47b 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e5e54d4..92b29aa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XSANE 0.991\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 10:10+0100\n"
+"POT-Creation-Date: 2007-08-13 09:22+0200\n"
 "PO-Revision-Date: 2003-03-27 12:00+0100\n"
 "Last-Translator: gnome-cn@gmail.com\n"
 "Language-Team: zh_CN\n"
@@ -83,7 +83,8 @@ msgid "rename fax page"
 msgstr "更名传真专案"
 
 #. WINDOW_FAX_INSERT
-msgid "insert ps-file into fax"
+#, fuzzy
+msgid "insert PS-file into fax"
 msgstr "插入ps档案到传真"
 
 #. WINDOW_EMAIL_PROJECT
@@ -509,7 +510,7 @@ msgid "Skip existing filenames"
 msgstr "省略已存在的档案"
 
 #. RADIO_BUTTON_SAVE_PS_FLATEDECODED
-msgid "Save postscript zlib compressed (ps level 3)"
+msgid "Save postscript zlib compressed (PS level 3)"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PDF_FLATEDECODED
@@ -517,7 +518,8 @@ msgid "Save PDF zlib compressed"
 msgstr ""
 
 #. RADIO_BUTTON_SAVE_PNM16_AS_ASCII
-msgid "Save 16bit pnm in ascii format"
+#, fuzzy
+msgid "Save 16bit PNM in ASCII format"
 msgstr "储存16位元pnm在ascii格式"
 
 #. RADIO_BUTTON_REDUCE_16BIT_TO_8BIT
@@ -541,8 +543,9 @@ msgstr "使用先前的colormap"
 msgid "Autoenhance gamma"
 msgstr "自动增强gamma"
 
-#. RADIO_BUTTON_PRESELECT_SCANAREA
-msgid "Preselect scanarea"
+#. RADIO_BUTTON_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Preselect scan area"
 msgstr "预先选择扫描区"
 
 #. RADIO_BUTTON_AUTOCORRECT_COLORS
@@ -566,10 +569,6 @@ msgstr "装置扫描中"
 msgid "Available devices:"
 msgstr "可用的装置有:"
 
-#. TEXT_XSANE_OPTIONS
-msgid "XSane options"
-msgstr "XSane 选项"
-
 #. TEXT_FILETYPE
 msgid "Type"
 msgstr "类型"
@@ -875,53 +874,70 @@ msgstr "命令"
 msgid "Copy number option:"
 msgstr ""
 
+#. TEXT_SETUP_SCAN_RESOLUTION_PRINTER
+#, fuzzy
+msgid "Scan resolution:"
+msgstr "设定扫描解析度"
+
 #. TEXT_SETUP_PRINTER_LINEART_RES
-msgid "Lineart resolution (dpi):"
+msgid "lineart [dpi]"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_GRAYSCALE_RES
-msgid "Grayscale resolution (dpi):"
+msgid "grayscale [dpi]"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_COLOR_RES
-msgid "Color resolution (dpi):"
-msgstr "色彩解析度 (dpi):"
+msgid "color [dpi]"
+msgstr ""
+
+#. TEXT_SETUP_PRINTER_PAPER_GEOMETRIE
+msgid "Paper geometrie:"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_WIDTH
-#. TEXT_SETUP_FAX_WIDTH
-msgid "Width"
+#, fuzzy
+msgid "width"
 msgstr "宽"
 
 #. TEXT_SETUP_PRINTER_HEIGHT
-#. TEXT_SETUP_FAX_HEIGHT
-msgid "Height"
+#, fuzzy
+msgid "height"
 msgstr "高"
 
 #. TEXT_SETUP_PRINTER_LEFT
-#. TEXT_SETUP_FAX_LEFT
-msgid "Left offset"
+#, fuzzy
+msgid "left offset"
 msgstr "左边差距"
 
 #. TEXT_SETUP_PRINTER_BOTTOM
-#. TEXT_SETUP_FAX_BOTTOM
-msgid "Bottom offset"
+#, fuzzy
+msgid "bottom offset"
 msgstr "下边差距"
 
+#. TEXT_SETUP_PRINTER_GAMMA_CORRECTION
+#, fuzzy
+msgid "Printer gamma:"
+msgstr "列表机 红色gamma"
+
 #. TEXT_SETUP_PRINTER_GAMMA
-msgid "Printer gamma value:"
-msgstr "列表机gamma值"
+#, fuzzy
+msgid "common value"
+msgstr "最近的值:"
 
 #. TEXT_SETUP_PRINTER_GAMMA_RED
-msgid "Printer gamma red:"
-msgstr "列表机 红色gamma"
+#, fuzzy
+msgid "red"
+msgstr "读取"
 
 #. TEXT_SETUP_PRINTER_GAMMA_GREEN
-msgid "Printer gamma green:"
-msgstr "列表机 绿色gamma"
+msgid "green"
+msgstr ""
 
 #. TEXT_SETUP_PRINTER_GAMMA_BLUE
-msgid "Printer gamma blue:"
-msgstr "列表机 蓝色gamma"
+#, fuzzy
+msgid "blue"
+msgstr "模糊"
 
 #. TEXT_SETUP_PRINTER_EMBED_CSA
 #, fuzzy
@@ -938,7 +954,7 @@ msgid "Apply black point compensation"
 msgstr ""
 
 #. TEXT_SETUP_PRINTER_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for printing"
+msgid "Create zlib compressed postscript image (PS level 3) for printing"
 msgstr ""
 
 #. TEXT_SETUP_TMP_PATH
@@ -1061,8 +1077,24 @@ msgstr ""
 msgid "Viewer (Postscript):"
 msgstr "检视器(Postscript)"
 
+#. TEXT_SETUP_FAX_WIDTH
+msgid "Width"
+msgstr "宽"
+
+#. TEXT_SETUP_FAX_HEIGHT
+msgid "Height"
+msgstr "高"
+
+#. TEXT_SETUP_FAX_LEFT
+msgid "Left offset"
+msgstr "左边差距"
+
+#. TEXT_SETUP_FAX_BOTTOM
+msgid "Bottom offset"
+msgstr "下边差距"
+
 #. TEXT_SETUP_FAX_PS_FLATEDECODED
-msgid "Create zlib compressed postscript image (ps level 3) for fax"
+msgid "Create zlib compressed postscript image (PS level 3) for fax"
 msgstr ""
 
 #. TEXT_SETUP_SMTP_SERVER
@@ -1431,12 +1463,14 @@ msgid "CCITT 1D Huffman compression"
 msgstr ""
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX3
-msgid "CCITT Group 3 Fax compression"
-msgstr ""
+#, fuzzy
+msgid "CCITT Group 3 fax compression"
+msgstr "不压缩"
 
 #. MENU_ITEM_TIFF_COMP_CCITFAX4
-msgid "CCITT Group 4 Fax compression"
-msgstr ""
+#, fuzzy
+msgid "CCITT Group 4 fax compression"
+msgstr "不压缩"
 
 #. MENU_ITEM_TIFF_COMP_JPEG
 msgid "JPEG DCT compression"
@@ -1566,8 +1600,9 @@ msgstr "接收%s资料"
 msgid "page"
 msgstr "页"
 
-#. PROGRESS_TRANSFERING_DATA
-msgid "Transfering image"
+#. PROGRESS_TRANSFERRING_DATA
+#, fuzzy
+msgid "Transferring image"
 msgstr "传输影像中"
 
 #. PROGRESS_ROTATING_DATA
@@ -1640,7 +1675,7 @@ msgstr ""
 #. DESC_XSANE_MEDIUM
 msgid ""
 "Select source medium type.\n"
-"To rename, reorder or delete an entry use context menu (right mouse "
+"To rename, reorder or delete an entry use context menu (alternate mouse "
 "button).\n"
 "To create a medium enable the option edit medium definition in preferences "
 "menu."
@@ -1978,11 +2013,12 @@ msgstr "暂存目录浏览"
 
 #. DESC_JPEG_QUALITY
 msgid ""
-"Quality in percent if image is saved as jpeg or tiff with jpeg compression"
+"Quality in percent if image is saved as JPEG or TIFF with JPEG compression"
 msgstr ""
 
 #. DESC_PNG_COMPRESSION
-msgid "Compression if image is saved as png"
+#, fuzzy
+msgid "Compression if image is saved as PNG"
 msgstr "如果存成png档的话,就压缩"
 
 #. DESC_FILENAME_COUNTER_LEN
@@ -1990,20 +2026,23 @@ msgid "Minimum length of counter in filename"
 msgstr ""
 
 #. DESC_TIFF_ZIP_COMPRESSION
-msgid "Compression rate for zip compressed tiff (deflate)"
+msgid "Compression rate for zip compressed TIFF (deflate)"
 msgstr ""
 
 #. DESC_TIFF_COMPRESSION_16
-msgid "Compression type if 16 bit image is saved as tiff"
-msgstr ""
+#, fuzzy
+msgid "Compression type if 16 bit image is saved as TIFF"
+msgstr "如果存成png档的话,就压缩"
 
 #. DESC_TIFF_COMPRESSION_8
-msgid "Compression type if 8 bit image is saved as tiff"
-msgstr ""
+#, fuzzy
+msgid "Compression type if 8 bit image is saved as TIFF"
+msgstr "如果存成png档的话,就压缩"
 
 #. DESC_TIFF_COMPRESSION_1
-msgid "Compression type if lineart image is saved as tiff"
-msgstr ""
+#, fuzzy
+msgid "Compression type if lineart image is saved as TIFF"
+msgstr "如果存成png档的话,就压缩"
 
 #. DESC_SAVE_DEVPREFS_AT_EXIT
 msgid "Save device dependant preferences in default file at exit of xsane"
@@ -2030,9 +2069,9 @@ msgstr ""
 
 #. DESC_SAVE_PNM16_AS_ASCII
 msgid ""
-"When a 16 bit image shall be saved in pnm format then use ascii format "
+"When a 16 bit image shall be saved in PNM format then use ASCII format "
 "instead of binary format. The binary format is a new format that is not "
-"supported by all programs. The ascii format is supported by more programs "
+"supported by all programs. The ASCII format is supported by more programs "
 "but it produces really huge files!!!"
 msgstr ""
 
@@ -2079,7 +2118,7 @@ msgid "Select how a range is displayed"
 msgstr "选择一个区域如何被显示"
 
 #. DESC_PREVIEW_OVERSAMPLING
-msgid "Value with that the calculated preview resolution is multiplied"
+msgid "Value with which the calculated preview resolution is multiplied"
 msgstr ""
 
 #. DESC_PREVIEW_GAMMA
@@ -2137,16 +2176,18 @@ msgid "dimension of square that is used to average color for pipette function"
 msgstr ""
 
 #. DESC_DOC_VIEWER
+#, fuzzy
 msgid ""
-"Enter command to be executed to display helpfiles, must be a html-viewer!"
+"Enter command to be executed to display helpfiles, must be a HTML-viewer!"
 msgstr "输入显示救助档时要被执行的命令,必须是一个html检视器"
 
 #. DESC_AUTOENHANCE_GAMMA
 msgid "Change gamma value when autoenhancement button is pressed"
 msgstr "更改gamma值如果自动增强按钮被按下时"
 
-#. DESC_PRESELECT_SCANAREA
-msgid "Select scanarea after preview scan has finished"
+#. DESC_PRESELECT_SCAN_AREA
+#, fuzzy
+msgid "Select scan area after preview scan has finished"
 msgstr "预览扫描后选择扫描区已经完成了"
 
 #. DESC_AUTOCORRECT_COLORS
@@ -2236,29 +2277,33 @@ msgstr ""
 #
 #. DESC_HTML_EMAIL
 #, fuzzy
-msgid "E-mail is sent in html mode, place image with: <IMAGE>"
+msgid "E-mail is sent in HTML mode, place image with: <IMAGE>"
 msgstr "邮件以HTML传送,影像直接显示"
 
 #. DESC_OCR_COMMAND
-msgid "Enter command to start ocr program"
+#, fuzzy
+msgid "Enter command to start OCR program"
 msgstr "输入开始OCR程式要执行的指令"
 
 #. DESC_OCR_INPUTFILE_OPT
-msgid "Enter option of the ocr program to define input file"
+#, fuzzy
+msgid "Enter option of the OCR program to define input file"
 msgstr "输入OCR程式的选项给定义的输入档"
 
 #. DESC_OCR_OUTPUTFILE_OPT
-msgid "Enter option of the ocr program to define output file"
+#, fuzzy
+msgid "Enter option of the OCR program to define output file"
 msgstr "输入OCR程式的选项给定义的输出档"
 
 #. DESC_OCR_USE_GUI_PIPE_OPT
-msgid "Define if the ocr program supports gui progress pipe"
+msgid "Define if the OCR program supports gui progress pipe"
 msgstr ""
 
 #. DESC_OCR_OUTFD_OPT
+#, fuzzy
 msgid ""
-"Enter option of the ocr program to define output filedescripor in GUI mode"
-msgstr ""
+"Enter option of the OCR program to define output filedescripor in GUI mode"
+msgstr "输入OCR程式的选项给定义的输出档"
 
 #. DESC_OCR_PROGRESS_KEYWORD
 msgid "Define Keyword that is used to mark progress information"
@@ -2294,7 +2339,8 @@ msgid "Pick black point"
 msgstr ""
 
 #. DESC_ZOOM_FULL
-msgid "Use full scanarea"
+#, fuzzy
+msgid "Use full scan area"
 msgstr "使用全部扫描区"
 
 #. DESC_ZOOM_OUT
@@ -2318,12 +2364,14 @@ msgstr ""
 msgid "Select visible area"
 msgstr "选择显示区"
 
-#. DESC_AUTOSELECT_SCANAREA
-msgid "Autoselect scanarea"
+#. DESC_AUTOSELECT_SCAN_AREA
+#, fuzzy
+msgid "Autoselect scan area"
 msgstr "自动选扫描区"
 
-#. DESC_AUTORAISE_SCANAREA
-msgid "Autoraise scanarea"
+#. DESC_AUTORAISE_SCAN_AREA
+#, fuzzy
+msgid "Autoraise scan area"
 msgstr "自动更改扫描区大小"
 
 #. DESC_DELETE_IMAGES
@@ -2333,7 +2381,7 @@ msgstr "删除预览影像快取"
 #. DESC_PRESET_AREA
 msgid ""
 "Preset area:\n"
-"To add new area or edit an existing area use contect menu (right mouse "
+"To add new area or edit an existing area use context menu (alternate mouse "
 "button)."
 msgstr ""
 
@@ -2362,15 +2410,18 @@ msgid "Clone image"
 msgstr "复制影像"
 
 #. DESC_ROTATE90
-msgid "Rotate image 90 degree"
+#, fuzzy
+msgid "Rotate image 90 degrees"
 msgstr "翻转影像90度"
 
 #. DESC_ROTATE180
-msgid "Rotate image 180 degree"
+#, fuzzy
+msgid "Rotate image 180 degrees"
 msgstr "翻转影像180度"
 
 #. DESC_ROTATE270
-msgid "Rotate image 270 degree"
+#, fuzzy
+msgid "Rotate image 270 degrees"
 msgstr "翻转影像270度"
 
 #. DESC_MIRROR_X
@@ -2406,11 +2457,11 @@ msgid "Y-Scale factor"
 msgstr ""
 
 #. DESC_SCALE_WIDTH
-msgid "Scale image to width [in pixel]"
+msgid "Scale image to width [pixels]"
 msgstr ""
 
 #. DESC_SCALE_HEIGHT
-msgid "Scale image to height [in pixel]"
+msgid "Scale image to height [pixels]"
 msgstr ""
 
 #. DESC_BATCH_LIST_EMPTY
@@ -2532,7 +2583,8 @@ msgid "Failed to open"
 msgstr "开启失败"
 
 #. ERR_CREATE_SECURE_FILE
-msgid "Could not create secure file (may be a link does exist):"
+#, fuzzy
+msgid "Could not create secure file (maybe a link does exist):"
 msgstr "不能建立安全档(可能连结已经存在)"
 
 #. ERR_FAILED_PRINTER_PIPE
@@ -2608,8 +2660,9 @@ msgid "Failed to execute fax command:"
 msgstr "不能执行传真命令"
 
 #. ERR_FAILED_EXEC_OCR_CMD
-msgid "Failed to execute ocr command:"
-msgstr "不能执行ocr命令"
+#, fuzzy
+msgid "Failed to execute OCR command:"
+msgstr "不能执行传真命令"
 
 #. ERR_BAD_FRAME_FORMAT
 msgid "bad frame format"
@@ -2669,11 +2722,12 @@ msgid "warning: option has no value constraint"
 msgstr ""
 
 #. WARN_XSANE_AS_ROOT
+#, fuzzy
 msgid ""
 "You try to run XSane as ROOT, that really is DANGEROUS!\n"
 "\n"
 "Do not send any bug reports when you\n"
-"have any problem while running XSane as root:\n"
+"have any problems while running XSane as root:\n"
 "YOU ARE ALONE!"
 msgstr ""
 "你试图以 ROOT 身份运行 XSane, 这样做将会十分危险！\n"
@@ -2896,7 +2950,7 @@ msgid ""
 "3) The permissions for the device file do not allow you to use it - try as "
 "root\n"
 "4) The backend is not loaded by SANE (man sane-dll)\n"
-"5) The backend is not configured correct (man sane-\"backendname\")\n"
+"5) The backend is not configured correctly (man sane-\"backendname\")\n"
 "6) Possibly there is more than one SANE version installed"
 msgstr ""
 
@@ -3089,7 +3143,8 @@ msgid "E-mail has been sent"
 msgstr "邮件已发送"
 
 #. TEXT_FAX_STATUS_QUEUEING_FAX
-msgid "Queueing Fax"
+#, fuzzy
+msgid "Queueing fax"
 msgstr "正在等待传真列队"
 
 #. TEXT_FAX_STATUS_FAX_QUEUED
@@ -3151,6 +3206,24 @@ msgstr "内存不足"
 msgid "Access to resource has been denied"
 msgstr "资源存取被禁止"
 
+#~ msgid "XSane options"
+#~ msgstr "XSane 选项"
+
+#~ msgid "Failed to execute ocr command:"
+#~ msgstr "不能执行ocr命令"
+
+#~ msgid "Color resolution (dpi):"
+#~ msgstr "色彩解析度 (dpi):"
+
+#~ msgid "Printer gamma value:"
+#~ msgstr "列表机gamma值"
+
+#~ msgid "Printer gamma green:"
+#~ msgstr "列表机 绿色gamma"
+
+#~ msgid "Printer gamma blue:"
+#~ msgstr "列表机 蓝色gamma"
+
 #, fuzzy
 #~ msgid "select scanner transmissive ICM-profile"
 #~ msgstr "删除列表机"
diff --git a/src/xsane-back-gtk.c b/src/xsane-back-gtk.c
index 6ed24a4..d74300e 100644
--- a/src/xsane-back-gtk.c
+++ b/src/xsane-back-gtk.c
@@ -294,6 +294,7 @@ int xsane_back_gtk_make_path(size_t buf_size, char *buf, const char *prog_name,
 
     buf[len++] = SLASH; /* OS/2 does not like slash at end of mktemp-path */
   }
+
   if (len >= buf_size)
   {
     goto filename_too_long;
@@ -431,15 +432,7 @@ int xsane_back_gtk_make_path(size_t buf_size, char *buf, const char *prog_name,
     len += 6;
     buf[len] = '\0';
 
-#if 1
     fd = mkstemp(buf); /* create unique filename and opens/creates the file */
-#else
-    mktemp(buf); /* not safe */
-    umask(0177);
-    fd = open(buf, O_WRONLY | O_EXCL | O_CREAT, 0600);
-    umask(XSANE_DEFAULT_UMASK); /* define new file permissions */
-#endif
-
     if (fd == -1)
     {
       xsane_back_gtk_error(ERR_CREATE_TEMP_FILE, FALSE);
@@ -937,7 +930,6 @@ void xsane_back_gtk_filetype_menu_set_history(GtkWidget *xsane_filetype_option_m
     select_item = filetype_nr;
   }
 #endif
-
   gtk_option_menu_set_history(GTK_OPTION_MENU(xsane_filetype_option_menu), select_item);
 }
 
@@ -1908,8 +1900,37 @@ static void xsane_back_gtk_value_update(GtkAdjustment *adj_data, DialogElement *
 
   xsane_back_gtk_set_option(opt_num, &val, SANE_ACTION_SET_VALUE);
   xsane_control_option(xsane.dev, opt_num, SANE_ACTION_GET_VALUE, &new_val, 0);
+#if 1
+  val = new_val;
+  switch(opt->type)
+  {
+    case SANE_TYPE_INT:
+      if (new_val != val)
+      {
+        adj_data->value = val;
+        g_signal_emit_by_name(GTK_OBJECT(adj_data), "value_changed");
+      }
+     break;
 
-  if (new_val != val)
+    case SANE_TYPE_FIXED:
+      if (abs(new_val - val) > 1) /* tolarate 1/65536 error, instead of: if (new_val != val) */
+      {
+        d = SANE_UNFIX(val);
+        if (opt->unit == SANE_UNIT_MM)
+        {
+          d /= preferences.length_unit;
+        }
+        adj_data->value = d;
+        g_signal_emit_by_name(GTK_OBJECT(adj_data), "value_changed");
+      }
+     break;
+
+    default:
+     break;
+  }
+#endif
+#if 0
+  if (abs(new_val - val) > 1) /* tolarate 1/65536 error, instead of: if (new_val != val) */
   {
     val = new_val;
     switch(opt->type)
@@ -1932,6 +1953,7 @@ static void xsane_back_gtk_value_update(GtkAdjustment *adj_data, DialogElement *
     }
     g_signal_emit_by_name(GTK_OBJECT(adj_data), "value_changed");
   }
+#endif
 
  return;			/* value didn't change */
 }
@@ -2474,7 +2496,7 @@ void xsane_back_gtk_update_scan_window(void)
             GTK_ADJUSTMENT(elem->data)->value = new_val;
           }
 
-          if (old_val != new_val)
+          if (old_val != new_val) /* XXX dangerous comparison of doubles, we should allow tiny differences */
           {
 	      g_signal_emit_by_name(GTK_OBJECT(elem->data), "value_changed");
           }
diff --git a/src/xsane-batch-scan.c b/src/xsane-batch-scan.c
index ff07e0c..85b259c 100644
--- a/src/xsane-batch-scan.c
+++ b/src/xsane-batch-scan.c
@@ -866,16 +866,15 @@ static void xsane_batch_scan_rename_callback(GtkWidget *widget, gpointer data)
       xsane_set_window_icon(rename_dialog, 0);
 
       /* set the main vbox */
-      vbox = gtk_vbox_new(FALSE, 0);
-      gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
+      vbox = gtk_vbox_new(FALSE, 10);
+      gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
       gtk_container_add(GTK_CONTAINER(rename_dialog), vbox);
       gtk_widget_show(vbox);
 
       /* set the main hbox */
       hbox = gtk_hbox_new(FALSE, 0);
-      xsane_separator_new(vbox, 2);
-      gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
-      gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
+      gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+      gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
       gtk_widget_show(hbox);
 
       gtk_window_set_position(GTK_WINDOW(rename_dialog), GTK_WIN_POS_CENTER);
diff --git a/src/xsane-email-project.c b/src/xsane-email-project.c
index b36dd59..c7451ee 100644
--- a/src/xsane-email-project.c
+++ b/src/xsane-email-project.c
@@ -151,12 +151,6 @@ void xsane_email_dialog()
   gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
   gtk_box_pack_start(GTK_BOX(email_scan_vbox), hbox, FALSE, FALSE, 1);
 
-#if 0
-  pixmap = gdk_pixmap_create_from_xpm_d(xsane.dialog->window, &mask, xsane.bg_trans, (gchar **) email_xpm);
-  pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask);
-  gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 2);
-  gdk_drawable_unref(pixmap);
-#endif
   button = xsane_button_new_with_pixmap(xsane.dialog->window, hbox, email_xpm, DESC_EMAIL_PROJECT_BROWSE,
 	                                                      (GtkSignalFunc) xsane_email_project_browse_filename_callback, NULL);
 
@@ -170,7 +164,6 @@ void xsane_email_dialog()
   xsane.project_entry = text;
   xsane.project_entry_box = hbox;
 
-//  gtk_widget_show(pixmapwidget);
   gtk_widget_show(text);
   gtk_widget_show(hbox);
 
@@ -548,7 +541,7 @@ static void xsane_email_project_display_status()
       xsane.email_progress_val = val / 100.0;
       if (xsane.project_progress_bar)
       {
-        gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), xsane.email_progress_val);
+        xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), xsane.email_progress_val);
       }
 
       DBG(DBG_info, "reading from lockfile: email_status %s, email_progress_val %1.3f\n" , xsane.email_status, xsane.email_progress_val);
@@ -578,7 +571,7 @@ static void xsane_email_project_display_status()
     if (xsane.project_progress_bar)
     {
       gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.email_status));
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), xsane.email_progress_val);
+      xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), xsane.email_progress_val);
     }
   
     while (gtk_events_pending())
@@ -848,7 +841,7 @@ static void xsane_email_project_load()
   }
 
   gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.email_status));
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), xsane.email_progress_val);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), xsane.email_progress_val);
 
   xsane_email_project_display_status();
 
@@ -943,13 +936,13 @@ void xsane_email_project_save()
     snprintf(buf, 32, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.email_status); /* fill 32 characters status line */
     fprintf(projectfile, "%s\n", buf); /* first line is status of email */
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.email_status));
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
   }
   else
   {
     fprintf(projectfile, "                                \n"); /* no email status */
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), "");
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
   }
 
   if (xsane.email_receiver)
@@ -1311,16 +1304,15 @@ static void xsane_email_entry_rename_callback(GtkWidget *widget, gpointer list)
     xsane_set_window_icon(rename_dialog, 0);
 
     /* set the main vbox */
-    vbox = gtk_vbox_new(FALSE, 0);
-    gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
+    vbox = gtk_vbox_new(FALSE, 10);
+    gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
     gtk_container_add(GTK_CONTAINER(rename_dialog), vbox);
     gtk_widget_show(vbox);
 
     /* set the main hbox */
     hbox = gtk_hbox_new(FALSE, 0);
-    xsane_separator_new(vbox, 2);
-    gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
-    gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
+    gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+    gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
     gtk_widget_show(hbox); 
 
     gtk_window_set_position(GTK_WINDOW(rename_dialog), GTK_WIN_POS_CENTER);
@@ -1491,7 +1483,7 @@ static void xsane_email_edit_callback(GtkWidget *widget, gpointer list)
     xsane_copy_file_by_name(outfilename, filename, xsane.multipage_progress_bar, &cancel_save);
 
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), "");
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 
     xsane_viewer_new(outfilename, NULL, FALSE, filename, VIEWER_NO_NAME_MODIFICATION, IMAGE_SAVED);
   }
diff --git a/src/xsane-fax-project.c b/src/xsane-fax-project.c
index 4b7b770..3f9df8f 100644
--- a/src/xsane-fax-project.c
+++ b/src/xsane-fax-project.c
@@ -408,7 +408,7 @@ static void xsane_fax_project_load()
   g_signal_connect(GTK_OBJECT(xsane.fax_receiver_entry), "changed", (GtkSignalFunc) xsane_fax_receiver_changed_callback, NULL);
 
   gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.fax_status));
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 }
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
@@ -500,13 +500,13 @@ void xsane_fax_project_save()
     snprintf(buf, 32, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.fax_status); /* fill 32 characters status line */
     fprintf(projectfile, "%s\n", buf); /* first line is status of mail */
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.fax_status));
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
   }
   else
   {
     fprintf(projectfile, "                                \n"); /* no mail status */
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), "");
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
   }
 
   if (xsane.fax_receiver)
@@ -578,7 +578,7 @@ static void xsane_fax_receiver_changed_callback(GtkWidget *widget, gpointer data
   xsane_fax_project_save();
 
   gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.fax_status));
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 }
 
 /* ----------------------------------------------------------------------------------------------------------------- */
@@ -789,16 +789,15 @@ static void xsane_fax_entry_rename_callback(GtkWidget *widget, gpointer list)
     xsane_set_window_icon(rename_dialog, 0);
 
     /* set the main vbox */
-    vbox = gtk_vbox_new(FALSE, 0);
-    gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
+    vbox = gtk_vbox_new(FALSE, 10);
+    gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
     gtk_container_add(GTK_CONTAINER(rename_dialog), vbox);
     gtk_widget_show(vbox);
 
     /* set the main hbox */
     hbox = gtk_hbox_new(FALSE, 0);
-    xsane_separator_new(vbox, 2);
-    gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
-    gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
+    gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+    gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
     gtk_widget_show(hbox); 
 
     gtk_window_set_position(GTK_WINDOW(rename_dialog), GTK_WIN_POS_CENTER);
@@ -1106,7 +1105,7 @@ static int xsane_fax_convert_pnm_to_ps(char *source_filename, char *fax_filename
   /* open progressbar */
   snprintf(buf, sizeof(buf), "%s - %s", PROGRESS_CONVERTING_DATA, source_filename);
   gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), buf);
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 
   while (gtk_events_pending())
   {
@@ -1173,7 +1172,7 @@ static int xsane_fax_convert_pnm_to_ps(char *source_filename, char *fax_filename
   }
 
   gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), "");
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 
   while (gtk_events_pending())
   {
@@ -1325,7 +1324,7 @@ static void xsane_fax_send()
     xsane.fax_status = strdup(TEXT_FAX_STATUS_QUEUEING_FAX);
     xsane_fax_project_update_project_status();
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.fax_status));
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 
     while (pid)
     {
@@ -1362,7 +1361,7 @@ static void xsane_fax_send()
     xsane.fax_status = strdup(TEXT_FAX_STATUS_FAX_QUEUED);
     xsane_fax_project_update_project_status();
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.fax_status));
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 
     xsane_set_sensitivity(TRUE);
 
diff --git a/src/xsane-front-gtk.c b/src/xsane-front-gtk.c
index 3d98a5b..589aa14 100644
--- a/src/xsane-front-gtk.c
+++ b/src/xsane-front-gtk.c
@@ -58,6 +58,7 @@ void xsane_progress_cancel(GtkWidget *widget, gpointer data);
 void xsane_progress_new(char *bar_text, char *info, GtkSignalFunc callback, int *cancel_data_pointer);
 void xsane_progress_update(gfloat newval);
 void xsane_progress_clear();
+void xsane_progress_bar_set_fraction(GtkProgressBar *progress_bar, gdouble fraction);
 GtkWidget *xsane_vendor_pixmap_new(GdkWindow *window, GtkWidget *parent);
 GtkWidget *xsane_toggle_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc,
                                          int *state, void *xsane_toggle_button_callback);
@@ -734,6 +735,49 @@ gint xsane_authorization_callback(SANE_String_Const resource,
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
 
+void xsane_progress_bar_set_fraction(GtkProgressBar *progress_bar, gdouble fraction)
+{
+   if (fraction < 0.0)
+   { 
+     fraction = 0.0; 
+   }
+
+   if (fraction > 1.0)
+   { 
+     fraction = 1.0; 
+   }
+
+#ifdef HAVE_GTK2
+  if ((fraction - gtk_progress_bar_get_fraction(progress_bar) > XSANE_PROGRESS_BAR_MIN_DELTA_PERCENT) || (fraction == 0.0) || (fraction > 0.99))
+  {
+    gtk_progress_bar_set_fraction(progress_bar, fraction);
+#if 0
+    /* this produces jumping scrollbars when we use it instead of the gtk_main_iteration loop */
+    if (GTK_WIDGET_DRAWABLE(progress_bar))
+    {
+      gdk_window_process_updates(progress_bar->progress.widget.window, TRUE);
+    }
+#endif
+    while (gtk_events_pending())
+    {
+      gtk_main_iteration();
+    }
+  }
+#else
+  if ((fraction - gtk_progress_get_current_percentage(&progress_bar->progress) > XSANE_PROGRESS_BAR_MIN_DELTA_PERCENT) || (fraction == 0.0) || (fraction > 0.99))
+  {
+    gtk_progress_bar_update(progress_bar, fraction);
+
+    while (gtk_events_pending())
+    {
+      gtk_main_iteration();
+    }
+  }
+#endif
+}
+
+/* ---------------------------------------------------------------------------------------------------------------------- */
+
 void xsane_progress_cancel(GtkWidget *widget, gpointer data)
 {
  void *cancel_data_pointer;
@@ -1015,7 +1059,7 @@ void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val,
 
   option_menu = gtk_option_menu_new();
   xsane_back_gtk_set_tooltip(xsane.tooltips, option_menu, desc);
-  gtk_box_pack_end(GTK_BOX(parent), option_menu, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(parent), option_menu, TRUE, TRUE, 5);
   gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
   gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), xsane_option_menu_lookup(menu_items, val));
 
@@ -1043,7 +1087,7 @@ void xsane_option_menu_new_with_pixmap(GdkWindow *window, GtkBox *parent, const
   DBG(DBG_proc, "xsane_option_menu_new_with_pixmap\n");
 
   hbox = gtk_hbox_new(FALSE, 5);
-  gtk_box_pack_start(parent, hbox, FALSE, FALSE, 0);
+  gtk_box_pack_start(parent, hbox, FALSE, FALSE, 2);
 
   pixmap = gdk_pixmap_create_from_xpm_d(window, &mask, xsane.bg_trans, (gchar **) xpm_d);
   pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask);
@@ -1172,7 +1216,7 @@ void xsane_range_new_with_pixmap(GdkWindow *window, GtkBox *parent, const char *
   DBG(DBG_proc, "xsane_slider_new_with_pixmap\n");
 
   hbox = gtk_hbox_new(FALSE, 5);
-  gtk_box_pack_start(parent, hbox, FALSE, FALSE, 1);
+  gtk_box_pack_start(parent, hbox, FALSE, FALSE, 2);
 
   pixmap = gdk_pixmap_create_from_xpm_d(window, &mask, xsane.bg_trans, (gchar **) xpm_d);
   pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask);
@@ -1303,7 +1347,10 @@ static void xsane_browse_filename_callback(GtkWidget *widget, gpointer data)
   xsane_back_gtk_filetype_menu_set_history(xsane.filetype_option_menu, preferences.filetype);
 
 #ifdef HAVE_LIBLCMS
-  gtk_option_menu_set_history(GTK_OPTION_MENU(xsane.cms_function_option_menu), preferences.cms_function);
+  if (xsane.enable_color_management)
+  {
+    gtk_option_menu_set_history(GTK_OPTION_MENU(xsane.cms_function_option_menu), preferences.cms_function);
+  }
 #endif
 
   /* correct length of filename counter if it is shorter than minimum length */
@@ -1424,13 +1471,12 @@ void xsane_outputfilename_new(GtkWidget *vbox)
 
   /* first line: disk icon, filename box */
 
-  hbox = gtk_hbox_new(FALSE, 2);
-  gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
+  hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
   button = xsane_button_new_with_pixmap(xsane.xsane_window->window, hbox, file_xpm, DESC_BROWSE_FILENAME,
                                         (GtkSignalFunc) xsane_browse_filename_callback, NULL);
-  gtk_widget_add_accelerator(button, "clicked", xsane.accelerator_group, GDK_B, GDK_CONTROL_MASK, DEF_GTK_ACCEL_LOCKED);
+  gtk_widget_add_accelerator(button, "clicked", xsane.accelerator_group, GDK_F, GDK_MOD1_MASK, DEF_GTK_ACCEL_LOCKED);
 
   text = gtk_entry_new();
   gtk_widget_set_size_request(text, 80, -1); /* set minimum size */
@@ -1439,7 +1485,7 @@ void xsane_outputfilename_new(GtkWidget *vbox)
   gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.filename);
   gtk_entry_set_position(GTK_ENTRY(text), strlen(preferences.filename)); /* set cursor to right position of filename */
 
-  gtk_box_pack_start(GTK_BOX(hbox), text, TRUE, TRUE, 4);
+  gtk_box_pack_end(GTK_BOX(hbox), text, TRUE, TRUE, 5);
   g_signal_connect(GTK_OBJECT(text), "changed", (GtkSignalFunc) xsane_outputfilename_changed_callback, NULL);
 
   xsane.outputfilename_entry = text;
@@ -1450,9 +1496,8 @@ void xsane_outputfilename_new(GtkWidget *vbox)
 
   /* second line: Step, Type */
 
-  hbox = gtk_hbox_new(FALSE, 2);
-  gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 1);
+  hbox = gtk_hbox_new(FALSE, 5);
+  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
   /* filename counter step */
 
@@ -1464,7 +1509,7 @@ void xsane_outputfilename_new(GtkWidget *vbox)
  
   xsane_filename_counter_step_option_menu = gtk_option_menu_new();
   xsane_back_gtk_set_tooltip(xsane.tooltips, xsane_filename_counter_step_option_menu, DESC_FILENAME_COUNTER_STEP);
-  gtk_box_pack_start(GTK_BOX(hbox), xsane_filename_counter_step_option_menu, FALSE, FALSE, 2);
+  gtk_box_pack_start(GTK_BOX(hbox), xsane_filename_counter_step_option_menu, FALSE, FALSE, 5);
   gtk_widget_show(xsane_filename_counter_step_option_menu);
   gtk_widget_show(hbox);
  
@@ -1489,7 +1534,7 @@ void xsane_outputfilename_new(GtkWidget *vbox)
   gtk_option_menu_set_history(GTK_OPTION_MENU(xsane_filename_counter_step_option_menu), select_item);
 
   xsane.filetype_option_menu = xsane_back_gtk_filetype_menu_new(preferences.filetype, (GtkSignalFunc) xsane_filetype_callback);
-  gtk_box_pack_end(GTK_BOX(hbox), xsane.filetype_option_menu, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(hbox), xsane.filetype_option_menu, FALSE, FALSE, 5);
   gtk_widget_show(xsane.filetype_option_menu);
 
   xsane_label = gtk_label_new(TEXT_FILETYPE); /* opposite order because of box_pack_end */
@@ -1810,7 +1855,7 @@ void xsane_change_working_directory(void)
   sprintf(windowname, "%s %s %s", xsane.prog_name, WINDOW_CHANGE_WORKING_DIR, xsane.device_text);
   if (getcwd(filename, sizeof(filename)))
   {
-//    xsane_back_gtk_get_filename(windowname, filename, sizeof(filename), filename, NULL, TRUE, FALSE, TRUE, FALSE);
+/*    xsane_back_gtk_get_filename(windowname, filename, sizeof(filename), filename, NULL, TRUE, FALSE, TRUE, FALSE); */
     if (chdir(filename))
     {
      char buf[TEXTBUFSIZE];
diff --git a/src/xsane-front-gtk.h b/src/xsane-front-gtk.h
index b7752bf..0a181bf 100644
--- a/src/xsane-front-gtk.h
+++ b/src/xsane-front-gtk.h
@@ -43,6 +43,7 @@ extern void xsane_authorization_button_callback(GtkWidget *widget, gpointer data
 extern gint xsane_authorization_callback(SANE_String_Const resource,
                                          SANE_Char username[SANE_MAX_USERNAME_LEN],
                                          SANE_Char password[SANE_MAX_PASSWORD_LEN]);
+extern void xsane_progress_bar_set_fraction(GtkProgressBar *progress_bar, gdouble fraction);
 extern void xsane_progress_cancel(GtkWidget *widget, gpointer data);
 extern void xsane_progress_new(char *bar_text, char *info, GtkSignalFunc callback, int *cancel_data_pointer);
 extern void xsane_progress_update(gfloat newval);
diff --git a/src/xsane-gtk-1_x-compat.h b/src/xsane-gtk-1_x-compat.h
index fea9c18..91be708 100644
--- a/src/xsane-gtk-1_x-compat.h
+++ b/src/xsane-gtk-1_x-compat.h
@@ -64,5 +64,5 @@
          gtk_window_set_policy(widget, FALSE, resizable, FALSE)
 # define gtk_image_new_from_pixmap(pixmap, mask) \
          gtk_pixmap_new(pixmap, mask)
-# define gtk_progress_bar_set_ellipsize() /* empty */
+# define gtk_progress_bar_set_ellipsize(pbar, mode) /* empty */
 #endif 
diff --git a/src/xsane-icons.c b/src/xsane-icons.c
index ba76144..6b0c9f2 100644
--- a/src/xsane-icons.c
+++ b/src/xsane-icons.c
@@ -3752,7 +3752,7 @@ const unsigned char cursor_pipette_mask[] =
 
 /* --------------------------------------------------- */
 
-const unsigned char cursor_autoraise_scanarea[] = 
+const unsigned char cursor_autoraise_scan_area[] = 
 {
    0xaa, 0x2a, 0xc1, 0x41, 0xe0, 0x03, 0x81, 0x40, 0x80, 0x00, 0x85, 0x50,
    0x86, 0x30, 0x7f, 0x7f, 0x86, 0x30, 0x85, 0x50, 0x80, 0x00, 0x81, 0x40,
@@ -3761,7 +3761,7 @@ const unsigned char cursor_autoraise_scanarea[] =
 
 /* --------------------------------------------------- */
 
-const unsigned char cursor_autoraise_scanarea_mask[] =
+const unsigned char cursor_autoraise_scan_area_mask[] =
 {
    0xea, 0x2b, 0xe1, 0x43, 0xf0, 0x07, 0xc1, 0x41, 0xc4, 0x11, 0xc7, 0x71,
    0xff, 0x7f, 0x7f, 0x7f, 0xff, 0x7f, 0xc7, 0x71, 0xc4, 0x11, 0xc1, 0x41,
diff --git a/src/xsane-icons.h b/src/xsane-icons.h
index 6f38cfb..2697b52 100644
--- a/src/xsane-icons.h
+++ b/src/xsane-icons.h
@@ -29,10 +29,10 @@
 #define CURSOR_PIPETTE_HEIGHT 16
 #define CURSOR_PIPETTE_HOT_X 1
 #define CURSOR_PIPETTE_HOT_Y 14
-#define CURSOR_AUTORAISE_SCANAREA_WIDTH 16
-#define CURSOR_AUTORAISE_SCANAREA_HEIGHT 16
-#define CURSOR_AUTORAISE_SCANAREA_HOT_X 7
-#define CURSOR_AUTORAISE_SCANAREA_HOT_Y 7
+#define CURSOR_AUTORAISE_SCAN_AREA_WIDTH 16
+#define CURSOR_AUTORAISE_SCAN_AREA_HEIGHT 16
+#define CURSOR_AUTORAISE_SCAN_AREA_HOT_X 7
+#define CURSOR_AUTORAISE_SCAN_AREA_HOT_Y 7
 #define CURSOR_ZOOM_WIDTH 16
 #define CURSOR_ZOOM_HEIGHT 16
 #define CURSOR_ZOOM_HOT_X 6
@@ -147,8 +147,8 @@ extern const char cursor_pipette_white[];
 extern const char cursor_pipette_gray[];
 extern const char cursor_pipette_black[];
 extern const char cursor_pipette_mask[];
-extern const char cursor_autoraise_scanarea[];
-extern const char cursor_autoraise_scanarea_mask[];
+extern const char cursor_autoraise_scan_area[];
+extern const char cursor_autoraise_scan_area_mask[];
 extern const char cursor_zoom[];
 extern const char cursor_zoom_mask[];
 #endif
diff --git a/src/xsane-multipage-project.c b/src/xsane-multipage-project.c
index 7d6a565..99b0106 100644
--- a/src/xsane-multipage-project.c
+++ b/src/xsane-multipage-project.c
@@ -454,7 +454,7 @@ static void xsane_multipage_project_load()
   }
 
   gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status));
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 }
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
@@ -525,13 +525,13 @@ void xsane_multipage_project_save()
     snprintf(buf, 32, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.multipage_status); /* fill 32 characters status line */
     fprintf(projectfile, "%s\n", buf); /* first line is status of multipage */
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status));
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
   }
   else
   {
     fprintf(projectfile, "                                \n"); /* no multipage status */
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), "");
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
   }
 
   if (xsane.multipage_filename)
@@ -834,7 +834,7 @@ static void xsane_multipage_edit_callback(GtkWidget *widget, gpointer list)
     xsane_multipage_project_save();
 
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status));
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 
     xsane_viewer_new(outfilename, NULL, FALSE, filename, VIEWER_NO_NAME_MODIFICATION, IMAGE_SAVED);
   }
@@ -882,7 +882,7 @@ static void xsane_multipage_save_file()
   xsane.multipage_status = strdup(TEXT_PROJECT_STATUS_FILE_SAVING);
 
   gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status));
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 
 
   snprintf(multipage_filename, sizeof(multipage_filename), "%s%s", preferences.multipage_project, preferences.multipage_filetype);
@@ -926,7 +926,7 @@ static void xsane_multipage_save_file()
         xsane.multipage_status = strdup(TEXT_PROJECT_STATUS_FILE_SAVING_ABORTED);
 
         gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status));
-        gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+        xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
        return;
       }
     }
@@ -962,7 +962,7 @@ static void xsane_multipage_save_file()
       xsane.multipage_status = strdup(TEXT_PROJECT_STATUS_FILE_SAVING_ERROR);
 
       gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status));
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+      xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
      return;
     }
 
@@ -993,7 +993,7 @@ static void xsane_multipage_save_file()
       xsane.multipage_status = strdup(TEXT_PROJECT_STATUS_FILE_SAVING_ERROR);
 
       gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status));
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+      xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
      return;
     }
   }
@@ -1012,7 +1012,7 @@ static void xsane_multipage_save_file()
     xsane.multipage_status = strdup(TEXT_PROJECT_STATUS_FILE_SAVING_ERROR);
 
     gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status));
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
    return;
   }
 
@@ -1049,7 +1049,7 @@ static void xsane_multipage_save_file()
       snprintf(buf, sizeof(buf), "%s", PROGRESS_PACKING_DATA);
                                                                                                                          
       gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), buf);
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+      xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
                                                                                                                          
       while (gtk_events_pending())
       {
@@ -1195,7 +1195,7 @@ static void xsane_multipage_save_file()
   xsane_multipage_project_save();
 
   gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status));
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
 
   xsane_multipage_project_set_sensitive(TRUE);
   xsane_set_sensitivity(TRUE); /* allow changing xsane mode */
diff --git a/src/xsane-preferences.c b/src/xsane-preferences.c
index 9747404..4f866f1 100644
--- a/src/xsane-preferences.c
+++ b/src/xsane-preferences.c
@@ -145,7 +145,7 @@ Preferences preferences =
        1,		/* rgb default */
        0,		/* negative */
        1,		/* autoenhance_gamma: change gamma value with autoenhance button */
-       1,		/* preselect_scanarea after preview scan */
+       1,		/* preselect_scan_area after preview scan */
        1,		/* auto_correct_colors after preview scan */
  GTK_UPDATE_DISCONTINUOUS, /* update policy for gtk frontend sliders */
        0,		/* medium_nr */
@@ -264,7 +264,7 @@ desc[] =
     {"rgb-default",			xsane_rc_pref_int,	POFFSET(xsane_rgb_default)},
     {"negative",			xsane_rc_pref_int,	POFFSET(xsane_negative)},
     {"auto-enhance-gamma",		xsane_rc_pref_int,	POFFSET(auto_enhance_gamma)},
-    {"preselect-scanarea",		xsane_rc_pref_int,	POFFSET(preselect_scanarea)},
+    {"preselect-scan-area",		xsane_rc_pref_int,	POFFSET(preselect_scan_area)},
     {"auto-correct-colors",		xsane_rc_pref_int,	POFFSET(auto_correct_colors)},
     {"gtk-update-policy",		xsane_rc_pref_int,	POFFSET(gtk_update_policy)},
     {"medium-nr",			xsane_rc_pref_int,	POFFSET(medium_nr)},
diff --git a/src/xsane-preferences.h b/src/xsane-preferences.h
index 228548e..720d108 100644
--- a/src/xsane-preferences.h
+++ b/src/xsane-preferences.h
@@ -194,7 +194,7 @@ typedef struct
     int    xsane_rgb_default;
     int    xsane_negative;
     int    auto_enhance_gamma;		/* change gamma value with automatic color correction */
-    int    preselect_scanarea;		/* automatic selection of scanarea after preview scan */
+    int    preselect_scan_area;		/* automatic selection of scan area after preview scan */
     int    auto_correct_colors;		/* automatic color correction after preview scan */
     int    gtk_update_policy;
     int    medium_nr;
diff --git a/src/xsane-preview.c b/src/xsane-preview.c
index 45679f1..e8b49a3 100644
--- a/src/xsane-preview.c
+++ b/src/xsane-preview.c
@@ -180,7 +180,7 @@ static void preview_add_batch(GtkWidget *window, Preview *p);
 static void preview_pipette_white(GtkWidget *window, gpointer data);
 static void preview_pipette_gray(GtkWidget *window, gpointer data);
 static void preview_pipette_black(GtkWidget *window, gpointer data);
-static void preview_init_autoraise_scanarea(GtkWidget *window, gpointer data);
+static void preview_init_autoraise_scan_area(GtkWidget *window, gpointer data);
 void preview_select_full_preview_area(Preview *p);
 static void preview_full_preview_area_callback(GtkWidget *widget, gpointer call_data);
 static void preview_delete_images_callback(GtkWidget *widget, gpointer call_data);
@@ -194,7 +194,7 @@ static void preview_preset_area_callback(GtkWidget *widget, gpointer data);
 static void preview_rotation_callback(GtkWidget *widget, gpointer data);
 static void preview_establish_ratio(Preview *p);
 static void preview_ratio_callback(GtkWidget *widget, gpointer data);
-static void preview_autoselect_scanarea_callback(GtkWidget *window, gpointer data);
+static void preview_autoselect_scan_area_callback(GtkWidget *window, gpointer data);
 
 void preview_display_with_correction(Preview *p);
 void preview_do_gamma_correction(Preview *p);
@@ -209,8 +209,8 @@ void preview_area_resize(Preview *p);
 gint preview_area_resize_handler(GtkWidget *widget, GdkEvent *event, gpointer data);
 void preview_update_maximum_output_size(Preview *p);
 void preview_set_maximum_output_size(Preview *p, float width, float height, int paper_orientation);
-void preview_autoraise_scanarea(Preview *p, int preview_x, int preview_y, float *autoselect_coord);
-void preview_autoselect_scanarea(Preview *p, float *autoselect_coord);
+void preview_autoraise_scan_area(Preview *p, int preview_x, int preview_y, float *autoselect_coord);
+void preview_autoselect_scan_area(Preview *p, float *autoselect_coord);
 void preview_display_valid(Preview *p);
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
@@ -699,7 +699,7 @@ static void preview_update_selection(Preview *p)
         coord[i] = val;
       }
     }
-    else /* backend does not use scanarea options */
+    else /* backend does not use scan area options */
     {
       switch (i)
       {
@@ -1875,9 +1875,9 @@ static void preview_scan_done(Preview *p, int save_image)
 
   sane_get_parameters(xsane.dev, &xsane.param); /* update xsane.param */
 
-  if ((preferences.preselect_scanarea) && (!p->startimage) && (!xsane.medium_calibration))
+  if ((preferences.preselect_scan_area) && (!p->startimage) && (!xsane.medium_calibration))
   {
-    preview_autoselect_scanarea(p, p->selection.coordinate); /* get autoselection coordinates */
+    preview_autoselect_scan_area(p, p->selection.coordinate); /* get autoselection coordinates */
     preview_draw_selection(p); 
     preview_establish_selection(p); 
     xsane_update_histogram(TRUE /* update_raw */); /* update histogram (necessary because overwritten by preview_update_surface) */
@@ -3777,14 +3777,14 @@ static gint preview_button_press_event_handler(GtkWidget *window, GdkEvent *even
       }
       break;
 
-      case MODE_AUTORAISE_SCANAREA:
+      case MODE_AUTORAISE_SCAN_AREA:
       {
-        DBG(DBG_info, "autoraise scanarea mode\n");
+        DBG(DBG_info, "autoraise scan area mode\n");
 
         if ( ( (((GdkEventButton *)event)->button == 1) || (((GdkEventButton *)event)->button == 2) ) &&
              (p->image_data_raw) ) /* left or middle button */
         {
-          preview_autoraise_scanarea(p, event->button.x, event->button.y, p->selection.coordinate); /* raise selection area */
+          preview_autoraise_scan_area(p, event->button.x, event->button.y, p->selection.coordinate); /* raise selection area */
         }
 
         p->mode = MODE_NORMAL;
@@ -4291,8 +4291,8 @@ Preview *preview_new(void)
 
   xsane_vseparator_new(p->button_box, 3);
 
-  p->full_area   = xsane_button_new_with_pixmap(p->top->window, p->button_box, auto_select_preview_area_xpm, DESC_AUTOSELECT_SCANAREA, (GtkSignalFunc) preview_autoselect_scanarea_callback, p);
-  p->autoraise   = xsane_button_new_with_pixmap(p->top->window, p->button_box, auto_raise_preview_area_xpm,  DESC_AUTORAISE_SCANAREA,  (GtkSignalFunc) preview_init_autoraise_scanarea,      p);
+  p->full_area   = xsane_button_new_with_pixmap(p->top->window, p->button_box, auto_select_preview_area_xpm, DESC_AUTOSELECT_SCAN_AREA, (GtkSignalFunc) preview_autoselect_scan_area_callback, p);
+  p->autoraise   = xsane_button_new_with_pixmap(p->top->window, p->button_box, auto_raise_preview_area_xpm,  DESC_AUTORAISE_SCAN_AREA,  (GtkSignalFunc) preview_init_autoraise_scan_area,      p);
   p->autoselect  = xsane_button_new_with_pixmap(p->top->window, p->button_box, full_preview_area_xpm,        DESC_FULL_PREVIEW_AREA,   (GtkSignalFunc) preview_full_preview_area_callback,   p);
 
   xsane_vseparator_new(p->button_box, 3);
@@ -4419,7 +4419,7 @@ Preview *preview_new(void)
   xsane_separator_new(middle_vbox, 1);
 
 
-  /* select maximum scanarea */
+  /* select maximum scan area */
   pixmap = gdk_pixmap_create_from_xpm_d(p->top->window, &mask, xsane.bg_trans, (gchar **) size_xpm);
   pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask);
   gtk_box_pack_start(GTK_BOX(p->menu_box), pixmapwidget, FALSE, FALSE, 2);
@@ -4668,7 +4668,7 @@ void preview_update_surface(Preview *p, int surface_changed)
 
   p->show_selection = FALSE; /* at first let's say we have no corrdinate selection */
 
-  for (i = 0; i < 4; ++i) /* test if surface (max vals of scanarea) has changed */
+  for (i = 0; i < 4; ++i) /* test if surface (max vals of scan area) has changed */
   {
 /*    val = (i & 2) ? INF : -INF; */
     val = (i & 2) ? INF : 0;
@@ -5564,7 +5564,7 @@ static void preview_pipette_black(GtkWidget *window, gpointer data)
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
 
-static void preview_init_autoraise_scanarea(GtkWidget *window, gpointer data)
+static void preview_init_autoraise_scan_area(GtkWidget *window, gpointer data)
 {
  Preview *p=data;
  GdkCursor *cursor;
@@ -5573,12 +5573,12 @@ static void preview_init_autoraise_scanarea(GtkWidget *window, gpointer data)
  GdkPixmap *pixmap;
  GdkPixmap *mask;
 
-  DBG(DBG_proc, "preview_init_autoraise_scanarea\n");
+  DBG(DBG_proc, "preview_init_autoraise_scan_area\n");
 
-  p->mode = MODE_AUTORAISE_SCANAREA;
+  p->mode = MODE_AUTORAISE_SCAN_AREA;
 
-  pixmap = gdk_bitmap_create_from_data(p->top->window, cursor_autoraise_scanarea,      CURSOR_AUTORAISE_SCANAREA_WIDTH, CURSOR_AUTORAISE_SCANAREA_HEIGHT);
-  mask   = gdk_bitmap_create_from_data(p->top->window, cursor_autoraise_scanarea_mask, CURSOR_AUTORAISE_SCANAREA_WIDTH, CURSOR_AUTORAISE_SCANAREA_HEIGHT);
+  pixmap = gdk_bitmap_create_from_data(p->top->window, cursor_autoraise_scan_area,      CURSOR_AUTORAISE_SCAN_AREA_WIDTH, CURSOR_AUTORAISE_SCAN_AREA_HEIGHT);
+  mask   = gdk_bitmap_create_from_data(p->top->window, cursor_autoraise_scan_area_mask, CURSOR_AUTORAISE_SCAN_AREA_WIDTH, CURSOR_AUTORAISE_SCAN_AREA_HEIGHT);
 
   fg.red   = 0;
   fg.green = 0;
@@ -5588,7 +5588,7 @@ static void preview_init_autoraise_scanarea(GtkWidget *window, gpointer data)
   bg.green = 65535;
   bg.blue  = 65535;
 
-  cursor = gdk_cursor_new_from_pixmap(pixmap, mask, &fg, &bg, CURSOR_AUTORAISE_SCANAREA_HOT_X, CURSOR_AUTORAISE_SCANAREA_HOT_Y);
+  cursor = gdk_cursor_new_from_pixmap(pixmap, mask, &fg, &bg, CURSOR_AUTORAISE_SCAN_AREA_HOT_X, CURSOR_AUTORAISE_SCAN_AREA_HOT_Y);
 
   gdk_window_set_cursor(p->window->window, cursor);
   gdk_cursor_unref(cursor);
@@ -6190,11 +6190,11 @@ static void preview_ratio_callback(GtkWidget *widget, gpointer data)
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
 
-static void preview_autoselect_scanarea_callback(GtkWidget *window, gpointer data)
+static void preview_autoselect_scan_area_callback(GtkWidget *window, gpointer data)
 {
  Preview *p=data;
 
-  preview_autoselect_scanarea(p, p->selection.coordinate); /* get autoselection coordinates */
+  preview_autoselect_scan_area(p, p->selection.coordinate); /* get autoselection coordinates */
   preview_draw_selection(p); 
   preview_establish_selection(p); 
   xsane_update_histogram(TRUE /* update raw */); /* update histogram (necessary because overwritten by preview_update_surface */
@@ -7092,7 +7092,7 @@ void preview_set_maximum_output_size(Preview *p, float width, float height, int
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
 #define AUTORAISE_ERROR 30
-void preview_autoraise_scanarea(Preview *p, int preview_x, int preview_y, float *autoselect_coord)
+void preview_autoraise_scan_area(Preview *p, int preview_x, int preview_y, float *autoselect_coord)
 {
  int x, y;
  int image_x, image_y;
@@ -7104,7 +7104,7 @@ void preview_autoraise_scanarea(Preview *p, int preview_x, int preview_y, float
  int top_ok, bottom_ok, left_ok, right_ok;
  float xscale, yscale;
 
-  DBG(DBG_proc, "preview_autoraise_scanarea\n");
+  DBG(DBG_proc, "preview_autoraise_scan_area\n");
 
   preview_transform_coordinate_window_to_image(p, preview_x, preview_y, &image_x, &image_y);
 
@@ -7327,7 +7327,7 @@ void preview_autoraise_scanarea(Preview *p, int preview_x, int preview_y, float
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
 
-void preview_autoselect_scanarea(Preview *p, float *autoselect_coord)
+void preview_autoselect_scan_area(Preview *p, float *autoselect_coord)
 {
  int x, y;
  int offset;
@@ -7338,7 +7338,7 @@ void preview_autoselect_scanarea(Preview *p, float *autoselect_coord)
  int brightness;
  int background_white;
 
-  DBG(DBG_proc, "preview_autoselect_scanarea\n");
+  DBG(DBG_proc, "preview_autoselect_scan_area\n");
 
   /* try to find out background color */
   /* add color values at the margins */
@@ -7373,16 +7373,16 @@ void preview_autoselect_scanarea(Preview *p, float *autoselect_coord)
   }
 
   brightness = bright_sum / (2 * (p->image_width + p->image_height) );
-  DBG(DBG_info, "preview_autoselect_scanarea: average margin brightness is %d\n", brightness);
+  DBG(DBG_info, "preview_autoselect_scan_area: average margin brightness is %d\n", brightness);
 
   if ( brightness > 128 )
   {
-    DBG(DBG_info, "preview_autoselect_scanarea: background is white\n");
+    DBG(DBG_info, "preview_autoselect_scan_area: background is white\n");
     background_white = 1;
   }
   else
   {
-    DBG(DBG_info, "preview_autoselect_scanarea: background is black\n");
+    DBG(DBG_info, "preview_autoselect_scan_area: background is black\n");
     background_white = 0;
   }
   
@@ -7505,7 +7505,7 @@ void preview_autoselect_scanarea(Preview *p, float *autoselect_coord)
 
   if ( (top >= bottom) || (right <= left) ) /* empty selection: use complete image */
   {
-    DBG(DBG_info, "autoselect_scanarea: empty selection: using complete area\n");
+    DBG(DBG_info, "autoselect_scan_area: empty selection: using complete area\n");
     top    = 0;
     bottom = p->image_height -1;
     left   = 0;
diff --git a/src/xsane-preview.h b/src/xsane-preview.h
index a488ce2..9fada8a 100644
--- a/src/xsane-preview.h
+++ b/src/xsane-preview.h
@@ -43,7 +43,7 @@ enum
   MODE_PIPETTE_WHITE,
   MODE_PIPETTE_GRAY,
   MODE_PIPETTE_BLACK,
-  MODE_AUTORAISE_SCANAREA,
+  MODE_AUTORAISE_SCAN_AREA,
   MODE_ZOOM_IN
 };
 
@@ -185,9 +185,9 @@ typedef struct
   GtkWidget *zoom_in;		/* zoom in button */
   GtkWidget *zoom_area;		/* zoom area button */
   GtkWidget *zoom_undo;		/* zoom undo button */
-  GtkWidget *full_area;		/* select full scanarea */
-  GtkWidget *autoraise;		/* autoraise scanarea */
-  GtkWidget *autoselect;	/* autoselect scanarea */
+  GtkWidget *full_area;		/* select full scan area */
+  GtkWidget *autoraise;		/* autoraise scan area */
+  GtkWidget *autoselect;	/* autoselect scan area */
   GtkWidget *preset_area_option_menu;	/* menu for selection of preview area */
   GtkWidget *rotation_option_menu;	/* menu for selection of rotation */
   GtkWidget *ratio_option_menu;	/* menu for selection of ratio */
diff --git a/src/xsane-save.c b/src/xsane-save.c
index 0109a2c..3d3b4c7 100644
--- a/src/xsane-save.c
+++ b/src/xsane-save.c
@@ -77,7 +77,11 @@ static void xsane_gimp_run(char *name, int nparams, GimpParam *param, int *nretu
  
 GimpPlugInInfo PLUG_IN_INFO =
 {
+#if 1
   NULL,                         /* init_proc */
+#else
+  xsane_gimp_query,             /* init_proc that queries xsane each time gimp is started */
+#endif
   NULL,                         /* quit_proc */
   xsane_gimp_query,             /* query_proc */
   xsane_gimp_run,               /* run_proc */
@@ -719,12 +723,7 @@ int xsane_copy_file(FILE *outfile, FILE *infile, GtkProgressBar *progress_bar, i
   size = ftell(infile);
   fseek(infile, 0, SEEK_SET);
 
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(progress_bar), 0.0);
-
-  while (gtk_events_pending())
-  {
-    gtk_main_iteration();
-  }
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), 0.0);
 
   while (!feof(infile))
   {
@@ -735,12 +734,7 @@ int xsane_copy_file(FILE *outfile, FILE *infile, GtkProgressBar *progress_bar, i
       bytes_sum += bytes;
     }
 
-    gtk_progress_bar_update(progress_bar, (float) bytes_sum / size); /* update progress bar */
-
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) bytes_sum / size); /* update progress bar */
 
     if (ferror(infile))
     {
@@ -822,12 +816,7 @@ int xsane_copy_file_by_name(char *output_filename, char *input_filename, GtkProg
   fclose(outfile);
 
   gtk_progress_set_format_string(GTK_PROGRESS(progress_bar), "");
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(progress_bar), 0.0);
-
-  while (gtk_events_pending())
-  {
-    gtk_main_iteration();
-  }
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), 0.0);
 
  return (*cancel_save);
 }
@@ -893,16 +882,21 @@ cmsHTRANSFORM xsane_create_cms_transform(Image_info *image_info, int cms_functio
     snprintf(buf, sizeof(buf), "%s\n%s %s: %s\n", ERR_CMS_CONVERSION, ERR_CMS_OPEN_ICM_FILE, CMS_SCANNER_ICM, image_info->icm_profile);
     xsane_back_gtk_error(buf, TRUE);
   }
-#if 0
-{
-  LPGAMMATABLE Gamma = cmsBuildGamma(256, 3.0);
-  hOutProfile = cmsCreateGrayProfile(cmsD50_xyY(), Gamma);
-  cmsFreeGamma(Gamma);
-}
-#endif
   if (cms_function == XSANE_CMS_FUNCTION_CONVERT_TO_SRGB)
   {
-    hOutProfile = cmsCreate_sRGBProfile();
+    if (image_info->channels == 1) /* == 1 (grayscale) */
+    {
+#if 1 /* xxx oli */
+     LPGAMMATABLE Gamma = cmsBuildGamma(256, 2.2);
+
+      hOutProfile = cmsCreateGrayProfile(cmsD50_xyY(), Gamma);
+      cmsFreeGamma(Gamma);
+#endif
+    }
+    else
+    {
+      hOutProfile = cmsCreate_sRGBProfile();
+    }
   }
   else
   {
@@ -1005,11 +999,7 @@ int xsane_save_grayscale_image_as_lineart(FILE *outfile, FILE *imagefile, Image_
     }
 
 
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height); /* update progress bar */
-    while (gtk_events_pending()) /* give gtk the chance to display the changes */
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height); /* update progress bar */
 
     if (*cancel_save)
     {
@@ -1107,11 +1097,7 @@ int xsane_save_scaled_image(FILE *outfile, FILE *imagefile, Image_info *image_in
   {
     DBG(DBG_info2, "xsane_save_scaled_image: original line %d, new line %d\n", (int) y, y_new);
 
-    gtk_progress_bar_update(progress_bar, (float) y / original_image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / original_image_height);
 
     if (read_line)
     {
@@ -1295,11 +1281,7 @@ int xsane_save_scaled_image(FILE *outfile, FILE *imagefile, Image_info *image_in
 
   for (y = 0; y < new_image_height; y++)
   {
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
     for (; ((int) original_y) - old_original_y; old_original_y += 1)
     {
@@ -1385,12 +1367,7 @@ int xsane_save_despeckle_image(FILE *outfile, FILE *imagefile, Image_info *image
 
   for (y = 0; y < image_info->image_height; y++)
   {
-    gtk_progress_bar_update(progress_bar, (float)  y / image_info->image_height);
-
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float)  y / image_info->image_height);
 
     ymin = y - radius;
     ymax = y + radius;
@@ -1578,11 +1555,7 @@ int xsane_save_blur_image(FILE *outfile, FILE *imagefile, Image_info *image_info
 
   for (y = 0; y < image_info->image_height; y++)
   {
-    gtk_progress_bar_update(progress_bar, (float)  y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float)  y / image_info->image_height);
 
     for (x = 0; x < image_info->image_width * image_info->channels; x++)
     {
@@ -1787,11 +1760,7 @@ int xsane_save_blur_image(FILE *outfile, FILE *imagefile, Image_info *image_info
 
   for (y = 0; y < image_info->image_height; y++)
   {
-    gtk_progress_bar_update(progress_bar, (float)  y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float)  y / image_info->image_height);
 
     for (x = 0; x < image_info->image_width * image_info->channels; x++)
     {
@@ -1929,11 +1898,7 @@ int xsane_save_rotate_image(FILE *outfile, FILE *imagefile, Image_info *image_in
 
       for (y = 0; y < pixel_height; y++)
       {
-        gtk_progress_bar_update(progress_bar, (float) y / pixel_height);
-        while (gtk_events_pending())
-        {
-          gtk_main_iteration();
-        }
+        xsane_progress_bar_set_fraction(progress_bar, (float) y / pixel_height);
 
         for (x = 0; x < pixel_width; x++)
         {
@@ -1986,11 +1951,7 @@ int xsane_save_rotate_image(FILE *outfile, FILE *imagefile, Image_info *image_in
 
       for (x=0; x<pixel_width; x++)
       {
-        gtk_progress_bar_update(progress_bar, (float) x / pixel_width);
-        while (gtk_events_pending())
-        {
-          gtk_main_iteration();
-        }
+        xsane_progress_bar_set_fraction(progress_bar, (float) x / pixel_width);
 
         for (y=pixel_height-1; y>=0; y--)
         {
@@ -2040,11 +2001,7 @@ int xsane_save_rotate_image(FILE *outfile, FILE *imagefile, Image_info *image_in
 
       for (y = pixel_height-1; y >= 0; y--)
       {
-        gtk_progress_bar_update(progress_bar, (float) (pixel_height - y) / pixel_height);
-        while (gtk_events_pending())
-        {
-          gtk_main_iteration();
-        }
+        xsane_progress_bar_set_fraction(progress_bar, (float) (pixel_height - y) / pixel_height);
 
         for (x = pixel_width-1; x >= 0; x--)
         {
@@ -2099,11 +2056,7 @@ int xsane_save_rotate_image(FILE *outfile, FILE *imagefile, Image_info *image_in
 
       for (x = pixel_width-1; x >= 0; x--)
       {
-        gtk_progress_bar_update(progress_bar, (float) (pixel_width - x) / pixel_width);
-        while (gtk_events_pending())
-        {
-          gtk_main_iteration();
-        }
+        xsane_progress_bar_set_fraction(progress_bar, (float) (pixel_width - x) / pixel_width);
 
         for (y = 0; y < pixel_height; y++)
         {
@@ -2152,11 +2105,7 @@ int xsane_save_rotate_image(FILE *outfile, FILE *imagefile, Image_info *image_in
 
       for (y = 0; y < pixel_height; y++)
       {
-        gtk_progress_bar_update(progress_bar, (float) y / pixel_height);
-        while (gtk_events_pending())
-        {
-          gtk_main_iteration();
-        }
+        xsane_progress_bar_set_fraction(progress_bar, (float) y / pixel_height);
 
         for (x = pixel_width-1; x >= 0; x--)
         {
@@ -2211,11 +2160,7 @@ int xsane_save_rotate_image(FILE *outfile, FILE *imagefile, Image_info *image_in
 
       for (x = 0; x < pixel_width; x++)
       {
-        gtk_progress_bar_update(progress_bar, (float) x / pixel_width);
-        while (gtk_events_pending())
-        {
-          gtk_main_iteration();
-        }
+        xsane_progress_bar_set_fraction(progress_bar, (float) x / pixel_width);
 
         for (y = 0; y < pixel_height; y++)
         {
@@ -2265,11 +2210,7 @@ int xsane_save_rotate_image(FILE *outfile, FILE *imagefile, Image_info *image_in
 
       for (y = pixel_height-1; y >= 0; y--)
       {
-        gtk_progress_bar_update(progress_bar, (float) (pixel_height - y) / pixel_height);
-        while (gtk_events_pending())
-        {
-          gtk_main_iteration();
-        }
+        xsane_progress_bar_set_fraction(progress_bar, (float) (pixel_height - y) / pixel_height);
 
         for (x = 0; x < pixel_width; x++)
         {
@@ -2324,11 +2265,7 @@ int xsane_save_rotate_image(FILE *outfile, FILE *imagefile, Image_info *image_in
 
       for (x = pixel_width-1; x >= 0; x--)
       {
-        gtk_progress_bar_update(progress_bar, (float) (pixel_width - x) / pixel_width);
-        while (gtk_events_pending())
-        {
-          gtk_main_iteration();
-        }
+        xsane_progress_bar_set_fraction(progress_bar, (float) (pixel_width - x) / pixel_width);
 
         for (y = pixel_height-1; y >= 0; y--)
         {
@@ -2439,7 +2376,7 @@ void xsane_save_ps_create_document_header(FILE *outfile, int pages,
   fprintf(outfile, "%%%%EndComments\n");
   fprintf(outfile, "%%%%BeginDocument: xsane.ps\n");
   fprintf(outfile, "\n");
-//  fprintf(outfile, "/origstate save def\n");
+/*  fprintf(outfile, "/origstate save def\n"); */
   fprintf(outfile, "20 dict begin\n");
 }
 
@@ -2450,7 +2387,7 @@ void xsane_save_ps_create_document_trailer(FILE *outfile, int pages)
   DBG(DBG_proc, "xsane_save_ps_create_document_trailer\n");
 
   fprintf(outfile, "end\n");
-//  fprintf(outfile, "origstate restore\n");
+/*  fprintf(outfile, "origstate restore\n"); */
 
   if (pages)
   {
@@ -3050,11 +2987,7 @@ static int xsane_save_ps_pdf_bw(FILE *outfile, FILE *imagefile, Image_info *imag
 
   for (y = 0; y < image_info->image_height; y++)
   {
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
     for (x = 0; x < bytes_per_line; x++)
     {
@@ -3118,11 +3051,13 @@ static int xsane_save_ps_pdf_bw(FILE *outfile, FILE *imagefile, Image_info *imag
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
 
-static int xsane_save_ps_pdf_gray(FILE *outfile, FILE *imagefile, Image_info *image_info, int ascii85decode, int flatedecode, cmsHTRANSFORM hTransform, int embed_scanner_icm_profile, GtkProgressBar *progress_bar, int *cancel_save)
+static int xsane_save_ps_pdf_gray(FILE *outfile, FILE *imagefile, Image_info *image_info, int ascii85decode, int flatedecode, cmsHTRANSFORM hTransform, int do_transform, GtkProgressBar *progress_bar, int *cancel_save)
 {
  int x, y;
  int ret;
- unsigned char *line;
+ unsigned char *line = NULL, *linep = NULL, *line16 = NULL;
+ int bytes_per_line;
+ int bytes_per_line16 = 0;
 #ifdef HAVE_LIBLCMS
  unsigned char *line_raw = NULL;
 #endif
@@ -3132,7 +3067,42 @@ static int xsane_save_ps_pdf_gray(FILE *outfile, FILE *imagefile, Image_info *im
 
   *cancel_save = 0;
 
-  line = (unsigned char *) malloc(image_info->image_width);
+  if (image_info->depth > 8) /* reduce 16 bit images to 12 bit */
+  {
+    bytes_per_line16 = image_info->image_width * 2;
+
+    bytes_per_line   = (image_info->image_width/2) * 3;
+
+    if (image_info->image_width & 1)
+    {
+      bytes_per_line += 2;
+    }
+
+    DBG(DBG_info, "bytes_per_line16 = %d\n", bytes_per_line16);
+    DBG(DBG_info, "bytes_per_line   = %d\n", bytes_per_line);
+  
+    line16 = (unsigned char *) malloc(bytes_per_line16);
+  
+    if (line16 == NULL)
+    {
+     char buf[TEXTBUFSIZE];
+        
+      snprintf(buf, sizeof(buf), "%s malloc for line16 failed", ERR_DURING_SAVE);
+      DBG(DBG_error, "%s\n", buf);
+      xsane_back_gtk_decision(ERR_HEADER_ERROR, (gchar **) error_xpm, buf, BUTTON_OK, NULL, TRUE /* wait */);
+      *cancel_save = 1;
+     return (*cancel_save);
+    }
+    DBG(DBG_info, "line16 allocated\n");
+  }
+  else
+  {
+    bytes_per_line   = image_info->image_width;
+    bytes_per_line16 = image_info->image_width;
+    DBG(DBG_info, "bytes_per_line = %d\n", bytes_per_line);
+  }
+
+  line = (unsigned char *) malloc(bytes_per_line);
 
   if (line == NULL)
   {
@@ -3145,10 +3115,43 @@ static int xsane_save_ps_pdf_gray(FILE *outfile, FILE *imagefile, Image_info *im
    return (*cancel_save);
   }
 
+  DBG(DBG_info, "line allocated\n");
+
+#ifdef HAVE_LIBLCMS
+  if (do_transform && (hTransform != NULL))
+  {
+    DBG(DBG_info, "Doing CMS color conversion\n");
+
+    line_raw = (unsigned char *) malloc(bytes_per_line16);
+
+    if (line_raw == NULL)
+    {
+     char buf[TEXTBUFSIZE];
+       
+      snprintf(buf, sizeof(buf), "%s malloc for line_raw failed", ERR_DURING_SAVE);
+      DBG(DBG_error, "%s\n", buf);
+      xsane_back_gtk_decision(ERR_HEADER_ERROR, (gchar **) error_xpm, buf, BUTTON_OK, NULL, TRUE /* wait */);
+
+      free(line);
+
+      if (line16)
+      {
+        free(line16);
+      }
+
+      *cancel_save = 1;
+     return (*cancel_save);
+    }
+
+    DBG(DBG_info, "line_raw allocated\n");
+  }
+#endif
+
   for (y = 0; y < image_info->image_height; y++)
   {
     if (image_info->depth > 8) /* reduce 16 bit images */
     {
+#if 0
      guint16 val;
 
       for (x = 0; x < image_info->image_width; x++)
@@ -3156,13 +3159,72 @@ static int xsane_save_ps_pdf_gray(FILE *outfile, FILE *imagefile, Image_info *im
         fread(&val, 2, 1, imagefile);
         line[x] = val/256;
       }
+#endif
+#if 1
+#ifdef HAVE_LIBLCMS
+      if (do_transform && (hTransform != NULL))
+      {
+        fread(line_raw, 2, image_info->image_width, imagefile);
+        cmsDoTransform(hTransform, line_raw, line16, image_info->image_width);
+      }
+      else
+#endif
+      {
+        fread(line16, 2, image_info->image_width, imagefile);
+      }
+
+      linep = line;
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+      for (x = 0; x < image_info->image_width; x=x+2)
+      {
+        *linep++ =   line16[2*x+1]; /* pixel0 high+middle */
+
+        if (x == image_info->image_width-1)
+        {
+          *linep++ = (line16[2*x+0] & 240); /* pixel0 low */
+          break;
+        }
+
+        *linep++ =  (line16[2*x+0] & 240)      |  (line16[2*x+3] >> 4); /* pixel0 low | pixel1 high */
+        *linep++ = ((line16[2*x+3] & 15) << 4) | ((line16[2*x+2] & 240) >> 4); /* pixel1 middle | pixel1 low */
+      }
+#else
+      for (x = 0; x < image_info->image_width; x=x+2)
+      {
+        *linep++ =   line16[2*x+0]; /* pixel0 high+middle */
+
+        if (x == image_info->image_width-1)
+        {
+          *linep++ = (line16[2*x+1] & 240); /* pixel0 low */
+          break;
+        }
+
+        *linep++ =  (line16[2*x+1] & 240)      |  (line16[2*x+2] >> 4); /* pixel0 low | pixel1 high */
+        *linep++ = ((line16[2*x+2] & 15) << 4) | ((line16[2*x+3] & 240) >> 4); /* pixel1 middle | pixel1 low */
+      }
+#endif
+#endif
     }
     else /* 8 bits/sample */
     {
+#if 0
       for (x = 0; x < image_info->image_width; x++)
       {
         line[x] = fgetc(imagefile);
       }
+#endif
+#ifdef HAVE_LIBLCMS
+      if (do_transform && (hTransform != NULL))
+      {
+        fread(line_raw, 1, image_info->image_width, imagefile);
+        cmsDoTransform(hTransform, line_raw, line, image_info->image_width);
+      }
+      else
+#endif
+      {
+        fread(line, 1, image_info->image_width, imagefile);
+      }
     }
 
     if (ascii85decode)
@@ -3170,23 +3232,23 @@ static int xsane_save_ps_pdf_gray(FILE *outfile, FILE *imagefile, Image_info *im
 #ifdef HAVE_LIBZ
       if (flatedecode)
       {
-        ret = xsane_write_compressed_a85_flatedecode(outfile, line, image_info->image_width, (y == image_info->image_height - 1));
+        ret = xsane_write_compressed_a85_flatedecode(outfile, line, bytes_per_line, (y == image_info->image_height - 1));
       }
       else
 #endif
       {
-        ret = xsane_write_compressed_a85(outfile, line, image_info->image_width, (y == image_info->image_height - 1));
+        ret = xsane_write_compressed_a85(outfile, line, bytes_per_line, (y == image_info->image_height - 1));
       }
     }
 #ifdef HAVE_LIBZ
     else if (flatedecode)
     {
-      ret = xsane_write_flatedecode(outfile, line, image_info->image_width, (y == image_info->image_height - 1));
+      ret = xsane_write_flatedecode(outfile, line, bytes_per_line, (y == image_info->image_height - 1));
     }
 #endif
     else
     {
-      fwrite(line, image_info->image_width, 1, outfile);
+      fwrite(line, bytes_per_line, 1, outfile);
     }
 
     if ((ret != 0) || (ferror(outfile)))
@@ -3209,11 +3271,7 @@ static int xsane_save_ps_pdf_gray(FILE *outfile, FILE *imagefile, Image_info *im
      break;
     }
 
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
     if (*cancel_save)
     {
@@ -3221,6 +3279,18 @@ static int xsane_save_ps_pdf_gray(FILE *outfile, FILE *imagefile, Image_info *im
     }
   }
 
+#ifdef HAVE_LIBLCMS
+  if (line_raw)
+  {
+    free(line_raw);
+  }
+#endif
+
+  if (line16)
+  {
+    free(line16);
+  }
+
   free(line);
 
  return (*cancel_save);
@@ -3232,11 +3302,11 @@ static int xsane_save_ps_pdf_color(FILE *outfile, FILE *imagefile, Image_info *i
                                    cmsHTRANSFORM hTransform, int do_transform,
                                    GtkProgressBar *progress_bar, int *cancel_save)
 {
-  int x, y;
-  int ret;
-  unsigned char *line = NULL, *linep = NULL, *line16 = NULL;
-  int bytes_per_line;
-  int bytes_per_line16 = 0;
+ int x, y;
+ int ret;
+ unsigned char *line = NULL, *linep = NULL, *line16 = NULL;
+ int bytes_per_line;
+ int bytes_per_line16 = 0;
 #ifdef HAVE_LIBLCMS
  unsigned char *line_raw = NULL;
 #endif
@@ -3331,11 +3401,7 @@ static int xsane_save_ps_pdf_color(FILE *outfile, FILE *imagefile, Image_info *i
  
   for (y = 0; y < image_info->image_height; y++)
   {
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
     linep = line;
 
@@ -4387,11 +4453,7 @@ int xsane_save_jpeg(FILE *outfile, int quality, FILE *imagefile, Image_info *ima
 
   for (y = 0; y < image_info->image_height; y++)
   {
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
     if (image_info->depth == 1)
     {
@@ -4692,11 +4754,7 @@ int xsane_save_tiff_page(TIFF *tiffile, int page, int pages, int quality, FILE *
 
   for (y = 0; y < image_info->image_height; y++)
   {
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
     
 #ifdef HAVE_LIBLCMS
     if ((cms_function != XSANE_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE) && (hTransform != NULL))
@@ -4944,11 +5002,7 @@ int xsane_save_png(FILE *outfile, int compression, FILE *imagefile, Image_info *
 
   for (y = 0; y < image_info->image_height; y++)
   {
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
 #ifdef HAVE_LIBLCMS
     if ((cms_function != XSANE_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE) && (hTransform != NULL))
@@ -5120,11 +5174,7 @@ int xsane_save_png_16(FILE *outfile, int compression, FILE *imagefile, Image_inf
 
   for (y = 0; y < image_info->image_height; y++)
   {
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
 #ifdef HAVE_LIBLCMS
     if ((cms_function != XSANE_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE) && (hTransform != NULL))
@@ -5265,11 +5315,8 @@ static int xsane_save_pnm_16_ascii_gray(FILE *outfile, FILE *imagefile, Image_in
 
     count = 0;
 
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
+
     if (*cancel_save)
     {
       break;
@@ -5377,11 +5424,7 @@ static int xsane_save_pnm_16_ascii_color(FILE *outfile, FILE *imagefile, Image_i
 
     count = 0;
 
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
     if (*cancel_save)
     {
@@ -5467,11 +5510,7 @@ static int xsane_save_pnm_16_binary_gray(FILE *outfile, FILE *imagefile, Image_i
       fputc(data[3*x+0] & 255, outfile);
     }
 
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
     if (ferror(outfile))
     {
@@ -5572,12 +5611,7 @@ static int xsane_save_pnm_16_binary_color(FILE *outfile, FILE *imagefile, Image_
       fputc(data[3*x+2] & 255, outfile);
     }
 
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
-
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
     if (ferror(outfile))
     {
@@ -5673,12 +5707,7 @@ static int xsane_save_pnm_8_gray(FILE *outfile, FILE *imagefile, Image_info *ima
       fputc(data[x], outfile);
     }
 
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
-
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
     if (ferror(outfile))
     {
@@ -5775,12 +5804,7 @@ static int xsane_save_pnm_8_color(FILE *outfile, FILE *imagefile, Image_info *im
       fputc(data[3*x+2], outfile);
     }
 
-    gtk_progress_bar_update(progress_bar, (float) y / image_info->image_height);
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
-
+    xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info->image_height);
 
     if (ferror(outfile))
     {
@@ -6028,7 +6052,7 @@ int xsane_save_image_as_text(char *output_filename, char *input_filename, GtkPro
  
   if (ocr_progress) /* pipe available */
   {
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), 0.0);
  
     while (!feof(ocr_progress))
     {
@@ -6056,7 +6080,7 @@ int xsane_save_image_as_text(char *output_filename, char *input_filename, GtkPro
           fprogress = 1.0;
         }
  
-        gtk_progress_bar_update(GTK_PROGRESS_BAR(progress_bar), fprogress);
+        xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), fprogress);
       }
  
       while (gtk_events_pending())
@@ -6066,7 +6090,7 @@ int xsane_save_image_as_text(char *output_filename, char *input_filename, GtkPro
     }
  
     gtk_progress_set_format_string(GTK_PROGRESS(progress_bar), "");
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(progress_bar), 0.0);
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), 0.0);
   }
   else /* no pipe available */
   {
@@ -6134,12 +6158,7 @@ int xsane_save_image_as(char *output_filename, char *input_filename, int output_
     snprintf(buf, sizeof(buf), "%s: %s", PROGRESS_PACKING_DATA, output_filename);
 
     gtk_progress_set_format_string(GTK_PROGRESS(progress_bar), buf);
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(progress_bar), 0.0);
-
-    while (gtk_events_pending())
-    {
-      gtk_main_iteration();
-    }
+    xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), 0.0);
 
     xsane_save_image_as_lineart(temporary_filename, input_filename, progress_bar, cancel_save);
 
@@ -6177,12 +6196,7 @@ int xsane_save_image_as(char *output_filename, char *input_filename, int output_
 
   gtk_progress_bar_set_ellipsize(GTK_PROGRESS_BAR(progress_bar), PANGO_ELLIPSIZE_START); /* this is new API, can be removed for old GTK versions */
   gtk_progress_set_format_string(GTK_PROGRESS(progress_bar), buf);
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(progress_bar), 0.0);
-
-  while (gtk_events_pending())
-  {
-    gtk_main_iteration();
-  }
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), 0.0);
 
 
 #ifdef HAVE_LIBTIFF
@@ -6329,12 +6343,7 @@ int xsane_save_image_as(char *output_filename, char *input_filename, int output_
           }
 
           gtk_progress_set_format_string(GTK_PROGRESS(progress_bar), "");
-          gtk_progress_bar_update(GTK_PROGRESS_BAR(progress_bar), 0.0);
-
-          while (gtk_events_pending())
-          {
-            gtk_main_iteration();
-          }
+          xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), 0.0);
 
          return -2;
          break; /* switch format == default */
@@ -6354,12 +6363,7 @@ int xsane_save_image_as(char *output_filename, char *input_filename, int output_
       }
 
       gtk_progress_set_format_string(GTK_PROGRESS(progress_bar), "");
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(progress_bar), 0.0);
-
-      while (gtk_events_pending())
-      {
-        gtk_main_iteration();
-      }
+      xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), 0.0);
 
      return -2;
     }
@@ -6385,12 +6389,7 @@ int xsane_save_image_as(char *output_filename, char *input_filename, int output_
   }
 
   gtk_progress_set_format_string(GTK_PROGRESS(progress_bar), "");
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(progress_bar), 0.0);
-
-  while (gtk_events_pending())
-  {
-    gtk_main_iteration();
-  }
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), 0.0);
 
  return (*cancel_save);
 }
@@ -6905,11 +6904,7 @@ int xsane_transfer_to_gimp(char *input_filename, int apply_ICM_profile, int cms_
                 tile_offset = 0;
               }
 
-              gtk_progress_bar_update(progress_bar, (float) y / image_info.image_height); /* update progress bar */
-              while (gtk_events_pending())
-              {
-                gtk_main_iteration();
-              }
+              xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info.image_height); /* update progress bar */
 
               break; /* leave for j loop */
             }
@@ -6950,11 +6945,7 @@ int xsane_transfer_to_gimp(char *input_filename, int apply_ICM_profile, int cms_
             tile_offset = 0;
           }
 
-          gtk_progress_bar_update(progress_bar, (float) y / image_info.image_height); /* update progress bar */
-          while (gtk_events_pending())
-          {
-            gtk_main_iteration();
-          }
+          xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info.image_height); /* update progress bar */
 
           if (*cancel_save)
           {
@@ -6992,11 +6983,7 @@ int xsane_transfer_to_gimp(char *input_filename, int apply_ICM_profile, int cms_
             tile_offset = 0;
           }
 
-          gtk_progress_bar_update(progress_bar, (float) y / image_info.image_height); /* update progress bar */
-          while (gtk_events_pending())
-          {
-            gtk_main_iteration();
-          }
+          xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info.image_height); /* update progress bar */
 
           if (*cancel_save)
           {
@@ -7044,11 +7031,7 @@ int xsane_transfer_to_gimp(char *input_filename, int apply_ICM_profile, int cms_
             tile_offset = 0;
           }
 
-          gtk_progress_bar_update(progress_bar, (float) y / image_info.image_height); /* update progress bar */
-          while (gtk_events_pending())
-          {
-            gtk_main_iteration();
-          }
+          xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info.image_height); /* update progress bar */
 
           if (*cancel_save)
           {
@@ -7089,11 +7072,7 @@ int xsane_transfer_to_gimp(char *input_filename, int apply_ICM_profile, int cms_
             tile_offset = 0;
           }
 
-          gtk_progress_bar_update(progress_bar, (float) y / image_info.image_height); /* update progress bar */
-          while (gtk_events_pending())
-          {
-            gtk_main_iteration();
-          }
+          xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info.image_height); /* update progress bar */
 
           if (*cancel_save)
           {
@@ -7135,11 +7114,7 @@ int xsane_transfer_to_gimp(char *input_filename, int apply_ICM_profile, int cms_
                 tile_offset = 0;
               }
 
-              gtk_progress_bar_update(progress_bar, (float) y / image_info.image_height); /* update progress bar */
-              while (gtk_events_pending())
-              {
-                gtk_main_iteration();
-              }
+              xsane_progress_bar_set_fraction(progress_bar, (float) y / image_info.image_height); /* update progress bar */
             }
           }
 
@@ -7687,6 +7662,9 @@ int write_smtp_header(int fd_socket, char *from, char *to, int auth_type, char *
 {
  char buf[1024];
  int len;
+ char to_line[1024];
+ char *to_pos = NULL;
+ char *pos = NULL;
 
   len = read(fd_socket, buf, sizeof(buf));
   if (len >= 0)
@@ -7732,7 +7710,11 @@ int write_smtp_header(int fd_socket, char *from, char *to, int auth_type, char *
    return -1;
   }
 
-  snprintf(buf, sizeof(buf), "MAIL FROM: %s\r\n", from);
+  while (from[0] == ' ')
+  {
+    from = from + 1;
+  }
+  snprintf(buf, sizeof(buf), "MAIL FROM: <%s>\r\n", from);
   DBG(DBG_info2, "> %s", buf);
   write(fd_socket, buf, strlen(buf));
   len = read(fd_socket, buf, sizeof(buf));
@@ -7754,29 +7736,55 @@ int write_smtp_header(int fd_socket, char *from, char *to, int auth_type, char *
     xsane_front_gtk_email_project_update_lockfile_status();
    return -1;
   }
-  
+ 
 
-  snprintf(buf, sizeof(buf), "RCPT TO: %s\r\n", to);
-  DBG(DBG_info2, "> %s", buf);
-  write(fd_socket, buf, strlen(buf));
-  len = read(fd_socket, buf, sizeof(buf));
-  if (len >= 0)
+  strncpy(to_line, to, sizeof(to_line)); /* it is not allowed to modify the "to" string, so we make a copy */
+  to_pos = to_line;
+  while (to_pos != NULL)
   {
-    buf[len] = 0;
-  }
-  DBG(DBG_info2, "< %s\n", buf);
+    while (*to_pos == ' ')
+    {
+      to_pos = to_pos + 1;
+    }
+    pos = strchr(to_pos, ',');
 
-  if (buf[0] != '2')
-  {
-    DBG(DBG_info, "=> error\n");
+    if (pos)
+    {
+      *pos = 0; /* end of string marker */
+    }
 
-    if (xsane.email_status)
+    snprintf(buf, sizeof(buf), "RCPT TO: <%s>\r\n", to_pos);
+
+    DBG(DBG_info2, "> %s", buf);
+    write(fd_socket, buf, strlen(buf));
+    len = read(fd_socket, buf, sizeof(buf));
+    if (len >= 0)
     {
-      free(xsane.email_status);
+      buf[len] = 0;
+    }
+    DBG(DBG_info2, "< %s\n", buf);
+  
+    if (buf[0] != '2')
+    {
+      DBG(DBG_info, "=> error\n");
+
+      if (xsane.email_status)
+      {
+        free(xsane.email_status);
+      }
+      xsane.email_status = strdup(TEXT_EMAIL_STATUS_SMTP_ERR_RCPT);
+      xsane_front_gtk_email_project_update_lockfile_status();
+     return -1;
+    }
+
+    if (pos)
+    {
+      to_pos = pos+1;
+    }
+    else
+    {
+      to_pos = NULL;
     }
-    xsane.email_status = strdup(TEXT_EMAIL_STATUS_SMTP_ERR_RCPT);
-    xsane_front_gtk_email_project_update_lockfile_status();
-   return -1;
   }
 
   snprintf(buf, sizeof(buf), "DATA\r\n");
diff --git a/src/xsane-scan.c b/src/xsane-scan.c
index 11aff3e..d6e164a 100644
--- a/src/xsane-scan.c
+++ b/src/xsane-scan.c
@@ -505,6 +505,9 @@ static void xsane_read_image_data(gpointer data, gint source, GdkInputCondition
         status = sane_read(dev, (SANE_Byte *) buf16, sizeof(buf16), &len);
       }
 
+      DBG(DBG_info, "sane_read returned with status %s\n", XSANE_STRSTATUS(status));
+      DBG(DBG_info, "sane_read: len = %d\n", len);
+
 
       if (!xsane.scanning) /* scan may have been canceled while sane_read was executed */
       {
@@ -947,7 +950,7 @@ static int xsane_reduce_to_lineart()
  int abort = 0;
 
   /* open progressbar */
-  xsane_progress_new(PROGRESS_PACKING_DATA, PROGRESS_TRANSFERING_DATA, (GtkSignalFunc) xsane_cancel_save, &xsane.cancel_save);
+  xsane_progress_new(PROGRESS_PACKING_DATA, PROGRESS_TRANSFERRING_DATA, (GtkSignalFunc) xsane_cancel_save, &xsane.cancel_save);
   while (gtk_events_pending())
   {
     gtk_main_iteration();
@@ -1134,7 +1137,7 @@ void xsane_scan_done(SANE_Status status)
         xsane_read_pnm_header(infile, &image_info);
 
         /* open progressbar */
-        xsane_progress_new(PROGRESS_ROTATING_DATA, PROGRESS_TRANSFERING_DATA, (GtkSignalFunc) xsane_cancel_save, &xsane.cancel_save);
+        xsane_progress_new(PROGRESS_ROTATING_DATA, PROGRESS_TRANSFERRING_DATA, (GtkSignalFunc) xsane_cancel_save, &xsane.cancel_save);
         while (gtk_events_pending())
         {
           gtk_main_iteration();
@@ -1246,7 +1249,7 @@ void xsane_scan_done(SANE_Status status)
       { /* ok, we have to do a transformation */
 
         /* open progressbar */
-        xsane_progress_new(PROGRESS_CONVERTING_DATA, PROGRESS_TRANSFERING_DATA, (GtkSignalFunc) xsane_cancel_save, &xsane.cancel_save);
+        xsane_progress_new(PROGRESS_CONVERTING_DATA, PROGRESS_TRANSFERRING_DATA, (GtkSignalFunc) xsane_cancel_save, &xsane.cancel_save);
         while (gtk_events_pending())
         {
           gtk_main_iteration();
@@ -1305,7 +1308,7 @@ void xsane_scan_done(SANE_Status status)
       }
 
       /* open progressbar */
-      xsane_progress_new(PROGRESS_CONVERTING_DATA, PROGRESS_TRANSFERING_DATA, (GtkSignalFunc) xsane_cancel_save, &xsane.cancel_save);
+      xsane_progress_new(PROGRESS_CONVERTING_DATA, PROGRESS_TRANSFERRING_DATA, (GtkSignalFunc) xsane_cancel_save, &xsane.cancel_save);
 
       while (gtk_events_pending())
       {
@@ -1471,7 +1474,7 @@ void xsane_scan_done(SANE_Status status)
       xsane_multipage_project_save();
 
       gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status));
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+      xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
     }
     else if (xsane.xsane_mode == XSANE_FAX)
     {
@@ -1512,7 +1515,7 @@ void xsane_scan_done(SANE_Status status)
       xsane_fax_project_save();
 
       gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.fax_status));
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+      xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
     }
 #ifdef XSANE_ACTIVATE_EMAIL
     else if (xsane.xsane_mode == XSANE_EMAIL)
@@ -1554,7 +1557,7 @@ void xsane_scan_done(SANE_Status status)
       xsane_email_project_save();
 
       gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.email_status));
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
+      xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0);
     }
 #endif
   }
@@ -1595,7 +1598,7 @@ void xsane_scan_done(SANE_Status status)
     DBG(DBG_info, "Batch mode end of scan\n");
     sane_cancel(xsane.dev); /* we have to call sane_cancel otherwise we are not able to set new parameters */
   }
-//  else if ( ( (status != SANE_STATUS_GOOD) && (status != SANE_STATUS_EOF) ) || (!xsane.batch_loop) ) /* last scan: update histogram */
+/*  else if ( ( (status != SANE_STATUS_GOOD) && (status != SANE_STATUS_EOF) ) || (!xsane.batch_loop) ) */ /* last scan: update histogram */
   else
   {
     DBG(DBG_info, "Normal end of scan\n");
diff --git a/src/xsane-setup.c b/src/xsane-setup.c
index 1078604..39ffee6 100644
--- a/src/xsane-setup.c
+++ b/src/xsane-setup.c
@@ -556,7 +556,7 @@ static void xsane_setup_enhance_apply_changes(GtkWidget *widget, gpointer data)
   preferences.preview_pipette_range = xsane_setup.preview_pipette_range;
 
   xsane_update_bool(xsane_setup.auto_enhance_gamma_button,  &preferences.auto_enhance_gamma);
-  xsane_update_bool(xsane_setup.preselect_scanarea_button,  &preferences.preselect_scanarea);
+  xsane_update_bool(xsane_setup.preselect_scan_area_button,  &preferences.preselect_scan_area);
   xsane_update_bool(xsane_setup.auto_correct_colors_button, &preferences.auto_correct_colors);
 
   xsane_update_gamma_curve(TRUE /* update raw */);
@@ -569,8 +569,6 @@ static void xsane_setup_color_management_apply_changes(GtkWidget *widget, gpoint
 {
   DBG(DBG_proc, "xsane_setup_colormagaement_apply_changes\n");
 
-//  preferences.cms_intent = gtk_option_menu_get_history(GTK_OPTION_MENU(xsane_setup.cms_intent_option_menu));
-//  preferences.cms_intent = gtk_option_menu_get_history(GTK_OPTION_MENU(xsane_setup.cms_intent_option_menu));
   preferences.cms_intent = (int) gtk_object_get_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(gtk_option_menu_get_menu(GTK_OPTION_MENU(xsane_setup.cms_intent_option_menu))))), "Selection");
   xsane_update_bool(xsane_setup.cms_bpc_button, &preferences.cms_bpc);
 
@@ -734,7 +732,6 @@ static void xsane_setup_email_apply_changes(GtkWidget *widget, gpointer data)
     preferences.email_auth_pass[i] ^= 0x53;
   }
 
-//  xsane_update_bool(xsane_setup.email_authentication_entry, &preferences.email_authentication);
   xsane_update_int(xsane_setup.email_smtp_port_entry, &preferences.email_smtp_port);
   xsane_update_int(xsane_setup.email_pop3_port_entry, &preferences.email_pop3_port);
 
@@ -1072,7 +1069,7 @@ static void xsane_setup_browse_printer_icm_profile_callback(GtkWidget *widget, g
 
 static void xsane_printer_notebook(GtkWidget *notebook)
 {
- GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text, *frame;
+ GtkWidget *setup_vbox, *vbox, *hbox, *title_hbox, *button_box, *button, *label, *text, *table, *separator;
  GtkWidget *printer_option_menu;
  char buf[64];
 
@@ -1080,27 +1077,23 @@ static void xsane_printer_notebook(GtkWidget *notebook)
 
   /* Printer options notebook page */
 
-  setup_vbox = gtk_vbox_new(FALSE, 5);
+  setup_vbox = gtk_vbox_new(FALSE, 0);
 
   label = gtk_label_new(NOTEBOOK_COPY_OPTIONS);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook), setup_vbox, label);
   gtk_widget_show(setup_vbox);
 
-  frame = gtk_frame_new(0);
-  gtk_container_set_border_width(GTK_CONTAINER(frame), 7);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(setup_vbox), frame, TRUE, TRUE, 0); /* sizeable framehight */
-  gtk_widget_show(frame);
 
-  vbox = gtk_vbox_new(FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
+  vbox = gtk_vbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(setup_vbox), vbox, TRUE, TRUE, 2); /* sizeable framehight, 2 pixels at top and bottom */
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); /* 6 pixels left and right */
   gtk_widget_show(vbox);
 
 
+  /* printer selection : */
 
-  hbox = gtk_hbox_new(FALSE, 2);
-  gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+  hbox = gtk_hbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
   label = gtk_label_new(TEXT_SETUP_PRINTER_SEL);
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
@@ -1125,7 +1118,7 @@ static void xsane_printer_notebook(GtkWidget *notebook)
 
   text = gtk_entry_new();
   xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PRINTER_NAME);
-  gtk_widget_set_size_request(text, 250, -1);
+  gtk_widget_set_size_request(text, 350, -1);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.printer[preferences.printernr]->name);
   gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
   gtk_widget_show(text);
@@ -1143,7 +1136,7 @@ static void xsane_printer_notebook(GtkWidget *notebook)
 
   text = gtk_entry_new();
   xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PRINTER_COMMAND);
-  gtk_widget_set_size_request(text, 250, -1);
+  gtk_widget_set_size_request(text, 350, -1);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.printer[preferences.printernr]->command);
   gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
   gtk_widget_show(text);
@@ -1161,7 +1154,7 @@ static void xsane_printer_notebook(GtkWidget *notebook)
 
   text = gtk_entry_new();
   xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_COPY_NUMBER_OPTION);
-  gtk_widget_set_size_request(text, 250, -1);
+  gtk_widget_set_size_request(text, 350, -1);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.printer[preferences.printernr]->copy_number_option);
   gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
   gtk_widget_show(text);
@@ -1171,14 +1164,24 @@ static void xsane_printer_notebook(GtkWidget *notebook)
 
   xsane_separator_new(vbox, 2);
 
+  table = gtk_table_new(8, 5, FALSE);
+  gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 2);
+  gtk_widget_show(table);
 
-  /* printer lineart resolution : */
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  /* title */
+  title_hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
+  label = gtk_label_new(TEXT_SETUP_SCAN_RESOLUTION_PRINTER);
+  gtk_box_pack_start(GTK_BOX(title_hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), title_hbox, 0, 1, 0, 1, GTK_FILL, 0, 0 , 0);
+  gtk_widget_show(label);
+  gtk_widget_show(title_hbox);
+
+
+  /* printer lineart resolution : */
 
   label = gtk_label_new(TEXT_SETUP_PRINTER_LINEART_RES);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 1, 2, 0, 1, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1186,19 +1189,15 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%d", preferences.printer[preferences.printernr]->lineart_resolution);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 1, 2, 1, 2, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_lineart_resolution_entry = text;
 
 
   /* printer grayscale resolution : */
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
-
   label = gtk_label_new(TEXT_SETUP_PRINTER_GRAYSCALE_RES);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1206,19 +1205,15 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%d", preferences.printer[preferences.printernr]->grayscale_resolution);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 2, 3, 1, 2, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_grayscale_resolution_entry = text;
 
 
   /* printer color resolution : */
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
-
   label = gtk_label_new(TEXT_SETUP_PRINTER_COLOR_RES);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 3, 4, 0, 1, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1226,23 +1221,32 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%d", preferences.printer[preferences.printernr]->color_resolution);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 3, 4, 1, 2, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_color_resolution_entry = text;
 
 
-  xsane_separator_new(vbox, 2);
+  gtk_table_set_row_spacing(GTK_TABLE(table), 1, 4);
+  separator = gtk_hseparator_new();
+  gtk_table_attach(GTK_TABLE(table), separator, 0, 5, 2, 3, GTK_FILL, 0, 0 , 0);
+  gtk_widget_show(separator);
+  gtk_table_set_row_spacing(GTK_TABLE(table), 2, 4);
 
 
-  /* printer width: */
+  /* title */
+  title_hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
+  label = gtk_label_new(TEXT_SETUP_PRINTER_PAPER_GEOMETRIE);
+  gtk_box_pack_start(GTK_BOX(title_hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), title_hbox, 0, 1, 3, 4, GTK_FILL, 0, 0 , 0);
+  gtk_widget_show(label);
+  gtk_widget_show(title_hbox);
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
-  snprintf(buf, sizeof(buf), "%s [%s]:", TEXT_SETUP_PRINTER_WIDTH, xsane_back_gtk_unit_string(SANE_UNIT_MM));
+  /* printer width: */
+
+  snprintf(buf, sizeof(buf), "%s [%s]", TEXT_SETUP_PRINTER_WIDTH, xsane_back_gtk_unit_string(SANE_UNIT_MM));
   label = gtk_label_new(buf);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 1, 2, 3, 4, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1250,19 +1254,15 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%4.3f", preferences.printer[preferences.printernr]->width / preferences.length_unit);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 1, 2, 4, 5, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_width_entry = text;
 
   /* printer height: */
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
-
-  snprintf(buf, sizeof(buf), "%s [%s]:", TEXT_SETUP_PRINTER_HEIGHT, xsane_back_gtk_unit_string(SANE_UNIT_MM));
+  snprintf(buf, sizeof(buf), "%s [%s]", TEXT_SETUP_PRINTER_HEIGHT, xsane_back_gtk_unit_string(SANE_UNIT_MM));
   label = gtk_label_new(buf);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 2, 3, 3, 4, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1270,19 +1270,15 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%4.3f", preferences.printer[preferences.printernr]->height / preferences.length_unit);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 2, 3, 4, 5, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_height_entry = text;
 
   /* printer left offset : */
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
-
-  snprintf(buf, sizeof(buf), "%s [%s]:", TEXT_SETUP_PRINTER_LEFT, xsane_back_gtk_unit_string(SANE_UNIT_MM));
+  snprintf(buf, sizeof(buf), "%s [%s]", TEXT_SETUP_PRINTER_LEFT, xsane_back_gtk_unit_string(SANE_UNIT_MM));
   label = gtk_label_new(buf);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 3, 4, 3, 4, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1290,19 +1286,15 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%4.3f", preferences.printer[preferences.printernr]->leftoffset / preferences.length_unit);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 3, 4, 4, 5, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_leftoffset_entry = text;
 
   /* printer bottom offset : */
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
-
-  snprintf(buf, sizeof(buf), "%s [%s]:", TEXT_SETUP_PRINTER_BOTTOM, xsane_back_gtk_unit_string(SANE_UNIT_MM));
+  snprintf(buf, sizeof(buf), "%s [%s]", TEXT_SETUP_PRINTER_BOTTOM, xsane_back_gtk_unit_string(SANE_UNIT_MM));
   label = gtk_label_new(buf);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 4, 5, 3, 4, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1310,22 +1302,31 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%4.3f", preferences.printer[preferences.printernr]->bottomoffset / preferences.length_unit);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 4, 5, 4, 5, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_bottomoffset_entry = text;
 
 
-  xsane_separator_new(vbox, 2);
+  gtk_table_set_row_spacing(GTK_TABLE(table), 4, 4);
+  separator = gtk_hseparator_new();
+  gtk_table_attach(GTK_TABLE(table), separator, 0, 5, 5, 6, GTK_FILL, 0, 0 , 0);
+  gtk_widget_show(separator);
+  gtk_table_set_row_spacing(GTK_TABLE(table), 5, 4);
 
 
-  /* printer gamma: */
+  /* title */
+  title_hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
+  label = gtk_label_new(TEXT_SETUP_PRINTER_GAMMA_CORRECTION);
+  gtk_box_pack_start(GTK_BOX(title_hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), title_hbox, 0, 1, 6, 7, GTK_FILL, 0, 0 , 0);
+  gtk_widget_show(label);
+  gtk_widget_show(title_hbox);
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+
+  /* printer gamma: */
 
   label = gtk_label_new(TEXT_SETUP_PRINTER_GAMMA);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 1, 2, 6, 7, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1333,18 +1334,14 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%1.2f", preferences.printer[preferences.printernr]->gamma);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 1, 2, 7, 8, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_gamma_entry = text;
 
   /* printer gamma red: */
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
-
   label = gtk_label_new(TEXT_SETUP_PRINTER_GAMMA_RED);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 2, 3, 6, 7, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1352,18 +1349,14 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%1.2f", preferences.printer[preferences.printernr]->gamma_red);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 2, 3, 7, 8, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_gamma_red_entry = text;
 
   /* printer gamma green: */
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
-
   label = gtk_label_new(TEXT_SETUP_PRINTER_GAMMA_GREEN);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 3, 4, 6, 7, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1371,18 +1364,14 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%1.2f", preferences.printer[preferences.printernr]->gamma_green);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 3, 4, 7, 8, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_gamma_green_entry = text;
 
   /* printer gamma blue: */
 
-  hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
-
   label = gtk_label_new(TEXT_SETUP_PRINTER_GAMMA_BLUE);
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), label, 4, 5, 6, 7, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(label);
 
   text = gtk_entry_new();
@@ -1390,9 +1379,8 @@ static void xsane_printer_notebook(GtkWidget *notebook)
   gtk_widget_set_size_request(text, 80, -1);
   snprintf(buf, sizeof(buf), "%1.2f", preferences.printer[preferences.printernr]->gamma_blue);
   gtk_entry_set_text(GTK_ENTRY(text), (char *) buf);
-  gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2);
+  gtk_table_attach(GTK_TABLE(table), text, 4, 5, 7, 8, GTK_SHRINK | GTK_EXPAND, 0, 0 , 0);
   gtk_widget_show(text);
-  gtk_widget_show(hbox);
   xsane_setup.printer_gamma_blue_entry = text;
 
 #ifdef HAVE_LIBLCMS
@@ -1486,33 +1474,36 @@ static void xsane_printer_notebook(GtkWidget *notebook)
 #endif
 
 
-  xsane_separator_new(vbox, 4);
+  xsane_separator_new(vbox, 2);
 
   /* "apply" "add printer" "delete printer" */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  gtk_widget_show(hbox);
 
-#ifdef HAVE_GTK2
-  button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-#else
-  button = gtk_button_new_with_label(BUTTON_APPLY);
-#endif
-  g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_printer_apply_changes, printer_option_menu);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
-  gtk_widget_show(button);
+  button_box = gtk_hbox_new(/* homogeneous */ TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button_box, FALSE, FALSE, 0);
+  gtk_widget_show(button_box);
 
   button = gtk_button_new_with_label(BUTTON_ADD_PRINTER);
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_printer_new, printer_option_menu);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(button_box), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
   button = gtk_button_new_with_label(BUTTON_DELETE_PRINTER);
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_printer_delete, printer_option_menu);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(button_box), button, TRUE, TRUE, 8);
   gtk_widget_show(button);
 
-  gtk_widget_show(hbox);
+#ifdef HAVE_GTK2
+  button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
+#else
+  button = gtk_button_new_with_label(BUTTON_APPLY);
+#endif
+  g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_printer_apply_changes, printer_option_menu);
+  gtk_box_pack_start(GTK_BOX(button_box), button, TRUE, TRUE, 0);
+  gtk_widget_show(button);
 }
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
@@ -1635,7 +1626,7 @@ static void xsane_setup_browse_working_color_space_icm_profile_callback(GtkWidge
 
 static void xsane_saving_notebook(GtkWidget *notebook)
 {
- GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text, *frame;
+ GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text;
  GtkWidget *filename_counter_len_option_menu, *filename_counter_len_menu, *filename_counter_len_item;
  char buf[64];
  int i, select = 1;
@@ -1643,24 +1634,20 @@ static void xsane_saving_notebook(GtkWidget *notebook)
   DBG(DBG_proc, "xsane_saving_notebook\n");
 
   /* Saving options notebook page */
-  setup_vbox = gtk_vbox_new(FALSE, 5);
+  setup_vbox = gtk_vbox_new(FALSE, 0);
 
   label = gtk_label_new(NOTEBOOK_SAVING_OPTIONS);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook), setup_vbox, label);
   gtk_widget_show(setup_vbox);
 
-  frame = gtk_frame_new(0);
-  gtk_container_set_border_width(GTK_CONTAINER(frame), 7);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(setup_vbox), frame, TRUE, TRUE, 0); /* sizeable framehight */
-  gtk_widget_show(frame);
-
-  vbox = gtk_vbox_new(FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
+  vbox = gtk_vbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(setup_vbox), vbox, TRUE, TRUE, 2); /* sizeable framehight */
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
   gtk_widget_show(vbox);
 
 
 
+
   /* tmp path : */
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
@@ -1788,7 +1775,7 @@ static void xsane_saving_notebook(GtkWidget *notebook)
   /* apply button */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
 #ifdef HAVE_GTK2
   button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
@@ -1796,7 +1783,7 @@ static void xsane_saving_notebook(GtkWidget *notebook)
   button = gtk_button_new_with_label(BUTTON_APPLY);
 #endif
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_saving_apply_changes, NULL);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
   gtk_widget_show(hbox);
@@ -1806,7 +1793,7 @@ static void xsane_saving_notebook(GtkWidget *notebook)
 
 static void xsane_filetype_notebook(GtkWidget *notebook)
 {
- GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *frame;
+ GtkWidget *setup_vbox, *vbox, *hbox, *button, *label;
 #ifdef HAVE_LIBTIFF
  int i, select = 1;
 
@@ -1860,23 +1847,19 @@ static void xsane_filetype_notebook(GtkWidget *notebook)
   DBG(DBG_proc, "xsane_filetype_notebook\n");
 
   /* Image options notebook page */
-  setup_vbox = gtk_vbox_new(FALSE, 5);
+  setup_vbox = gtk_vbox_new(FALSE, 0);
 
   label = gtk_label_new(NOTEBOOK_FILETYPE_OPTIONS);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook), setup_vbox, label);
   gtk_widget_show(setup_vbox);
 
-  frame = gtk_frame_new(0);
-  gtk_container_set_border_width(GTK_CONTAINER(frame), 7);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(setup_vbox), frame, TRUE, TRUE, 0); /* sizeable framehight */
-  gtk_widget_show(frame);
-
-  vbox = gtk_vbox_new(FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
+  vbox = gtk_vbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(setup_vbox), vbox, TRUE, TRUE, 2); /* sizeable framehight */
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
   gtk_widget_show(vbox);
 
 
+
   /* reduce 16bit to 8bit */
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
@@ -2079,7 +2062,7 @@ static void xsane_filetype_notebook(GtkWidget *notebook)
   /* apply button */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
 #ifdef HAVE_GTK2
   button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
@@ -2087,7 +2070,7 @@ static void xsane_filetype_notebook(GtkWidget *notebook)
   button = gtk_button_new_with_label(BUTTON_APPLY);
 #endif
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_image_apply_changes, NULL);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
   gtk_widget_show(hbox);
@@ -2125,7 +2108,7 @@ static void xsane_fax_notebook_set_faxprogram_default_callback(GtkWidget *widget
 
 static void xsane_fax_notebook(GtkWidget *notebook)
 {
- GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text, *frame;
+ GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text;
  char buf[64];
  int i;
 
@@ -2133,22 +2116,18 @@ static void xsane_fax_notebook(GtkWidget *notebook)
 
   /* Fax options notebook page */
 
-  setup_vbox = gtk_vbox_new(FALSE, 5);
+  setup_vbox = gtk_vbox_new(FALSE, 0);
 
   label = gtk_label_new(NOTEBOOK_FAX_OPTIONS);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook), setup_vbox, label);
   gtk_widget_show(setup_vbox);
 
-  frame = gtk_frame_new(0);
-  gtk_container_set_border_width(GTK_CONTAINER(frame), 7);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(setup_vbox), frame, TRUE, TRUE, 0); /* sizeable framehight */
-  gtk_widget_show(frame);
-
-  vbox = gtk_vbox_new(FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
+  vbox = gtk_vbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(setup_vbox), vbox, TRUE, TRUE, 2); /* sizeable framehight */
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
   gtk_widget_show(vbox);
 
+
   /* faxcommand : */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
@@ -2392,7 +2371,7 @@ static void xsane_fax_notebook(GtkWidget *notebook)
   /* apply button */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
 #ifdef HAVE_GTK2
   button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
@@ -2400,7 +2379,7 @@ static void xsane_fax_notebook(GtkWidget *notebook)
   button = gtk_button_new_with_label(BUTTON_APPLY);
 #endif
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_fax_apply_changes, NULL);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
   gtk_widget_show(hbox);
@@ -2420,7 +2399,7 @@ static void xsane_email_notebook(GtkWidget *notebook)
 
 #define AUTHENTICATION_NUMBER 4
 
- GtkWidget *setup_vbox, *vbox, *pop3_vbox, *hbox, *button, *label, *text, *frame;
+ GtkWidget *setup_vbox, *vbox, *pop3_vbox, *hbox, *button, *label, *text;
  GtkWidget *authentication_option_menu, *authentication_menu, *authentication_menu_item;
  char buf[64];
  char *password;
@@ -2431,23 +2410,19 @@ static void xsane_email_notebook(GtkWidget *notebook)
 
   /* Mail options notebook page */
 
-  setup_vbox = gtk_vbox_new(FALSE, 5);
+  setup_vbox = gtk_vbox_new(FALSE, 0);
 
   label = gtk_label_new(NOTEBOOK_EMAIL_OPTIONS);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook), setup_vbox, label);
   gtk_widget_show(setup_vbox);
 
-  frame = gtk_frame_new(0);
-  gtk_container_set_border_width(GTK_CONTAINER(frame), 7);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(setup_vbox), frame, TRUE, TRUE, 0); /* sizeable framehight */
-  gtk_widget_show(frame);
-
-  vbox = gtk_vbox_new(FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
+  vbox = gtk_vbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(setup_vbox), vbox, TRUE, TRUE, 2); /* sizeable framehight */
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
   gtk_widget_show(vbox);
 
 
+
   /* from */
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
@@ -2671,7 +2646,7 @@ static void xsane_email_notebook(GtkWidget *notebook)
   /* apply button */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
 #ifdef HAVE_GTK2
   button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
@@ -2679,7 +2654,7 @@ static void xsane_email_notebook(GtkWidget *notebook)
   button = gtk_button_new_with_label(BUTTON_APPLY);
 #endif
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_email_apply_changes, NULL);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
   gtk_widget_show(hbox);
@@ -2690,28 +2665,24 @@ static void xsane_email_notebook(GtkWidget *notebook)
 
 static void xsane_ocr_notebook(GtkWidget *notebook)
 {
- GtkWidget *setup_vbox, *vbox, *hbox, *label, *text, *frame, *button;
+ GtkWidget *setup_vbox, *vbox, *hbox, *label, *text, *button;
 
   DBG(DBG_proc, "xsane_ocr_notebook\n");
 
   /* OCR options notebook page */
 
-  setup_vbox = gtk_vbox_new(FALSE, 5);
+  setup_vbox = gtk_vbox_new(FALSE, 0);
 
   label = gtk_label_new(NOTEBOOK_OCR_OPTIONS);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook), setup_vbox, label);
   gtk_widget_show(setup_vbox);
 
-  frame = gtk_frame_new(0);
-  gtk_container_set_border_width(GTK_CONTAINER(frame), 7);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(setup_vbox), frame, TRUE, TRUE, 0); /* sizeable framehight */
-  gtk_widget_show(frame);
-
-  vbox = gtk_vbox_new(FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
+  vbox = gtk_vbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(setup_vbox), vbox, TRUE, TRUE, 2); /* sizeable framehight */
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
   gtk_widget_show(vbox);
 
+
   /* ocr command : */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
@@ -2823,7 +2794,7 @@ static void xsane_ocr_notebook(GtkWidget *notebook)
   /* apply button */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
 #ifdef HAVE_GTK2
   button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
@@ -2831,7 +2802,7 @@ static void xsane_ocr_notebook(GtkWidget *notebook)
   button = gtk_button_new_with_label(BUTTON_APPLY);
 #endif
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_ocr_apply_changes, NULL);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
   gtk_widget_show(hbox);
 }
@@ -2840,7 +2811,7 @@ static void xsane_ocr_notebook(GtkWidget *notebook)
 
 static void xsane_display_notebook(GtkWidget *notebook)
 {
- GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text, *frame;
+ GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text;
  GtkWidget *show_range_mode_option_menu, *show_range_mode_menu, *show_range_mode_item;
  char buf[64];
  int i, select = 1;
@@ -2858,22 +2829,18 @@ static void xsane_display_notebook(GtkWidget *notebook)
 
   /* Display options notebook page */
 
-  setup_vbox = gtk_vbox_new(FALSE, 5);
+  setup_vbox = gtk_vbox_new(FALSE, 0);
 
   label = gtk_label_new(NOTEBOOK_DISPLAY_OPTIONS);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook), setup_vbox, label);
   gtk_widget_show(setup_vbox);
 
-  frame = gtk_frame_new(0);
-  gtk_container_set_border_width(GTK_CONTAINER(frame), 7);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(setup_vbox), frame, TRUE, TRUE, 0); /* sizeable framehight */
-  gtk_widget_show(frame);
-
-  vbox = gtk_vbox_new(FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
+  vbox = gtk_vbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(setup_vbox), vbox, TRUE, TRUE, 2); /* sizeable framehight */
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
   gtk_widget_show(vbox);
 
+
   /* main window fixed: */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
@@ -3094,7 +3061,7 @@ static void xsane_display_notebook(GtkWidget *notebook)
   /* apply button */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
 #ifdef HAVE_GTK2
   button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
@@ -3102,7 +3069,7 @@ static void xsane_display_notebook(GtkWidget *notebook)
   button = gtk_button_new_with_label(BUTTON_APPLY);
 #endif
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_display_apply_changes, NULL);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
   gtk_widget_show(hbox);
@@ -3187,7 +3154,7 @@ static void xsane_setup_preview_pipette_range_callback(GtkWidget *widget, gpoint
 
 static void xsane_enhance_notebook(GtkWidget *notebook)
 {
- GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text, *frame;
+ GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text;
  GtkWidget *lineart_mode_option_menu, *lineart_mode_menu, *lineart_mode_item;
  GtkWidget *gray_option_menu, *gray_menu, *gray_item;
  GtkWidget *preview_pipette_range_option_menu, *preview_pipette_range_menu, *preview_pipette_range_item;
@@ -3208,22 +3175,18 @@ static void xsane_enhance_notebook(GtkWidget *notebook)
 
   /* enhancement options notebook page */
 
-  setup_vbox = gtk_vbox_new(FALSE, 5);
+  setup_vbox = gtk_vbox_new(FALSE, 0);
 
   label = gtk_label_new(NOTEBOOK_ENHANCE_OPTIONS);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook), setup_vbox, label);
   gtk_widget_show(setup_vbox);
 
-  frame = gtk_frame_new(0);
-  gtk_container_set_border_width(GTK_CONTAINER(frame), 7);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(setup_vbox), frame, TRUE, TRUE, 0); /* sizeable framehight */
-  gtk_widget_show(frame);
-
-  vbox = gtk_vbox_new(FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
+  vbox = gtk_vbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(setup_vbox), vbox, TRUE, TRUE, 2); /* sizeable framehight */
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
   gtk_widget_show(vbox);
 
+
   /* lineart modus menu  */
   lineart_mode_strings[0].name   = MENU_ITEM_LINEART_MODE_STANDARD;
   lineart_mode_strings[0].number = XSANE_LINEART_STANDARD;
@@ -3430,16 +3393,16 @@ static void xsane_enhance_notebook(GtkWidget *notebook)
   gtk_widget_show(hbox);
   xsane_setup.auto_enhance_gamma_button = button;
 
-  /* autoselect scanarea */
+  /* autoselect scan area */
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
-  button = gtk_check_button_new_with_label(RADIO_BUTTON_PRESELECT_SCANAREA);
-  xsane_back_gtk_set_tooltip(xsane.tooltips, button, DESC_PRESELECT_SCANAREA);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), preferences.preselect_scanarea);
+  button = gtk_check_button_new_with_label(RADIO_BUTTON_PRESELECT_SCAN_AREA);
+  xsane_back_gtk_set_tooltip(xsane.tooltips, button, DESC_PRESELECT_SCAN_AREA);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), preferences.preselect_scan_area);
   gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 2);
   gtk_widget_show(button);
   gtk_widget_show(hbox);
-  xsane_setup.preselect_scanarea_button = button;
+  xsane_setup.preselect_scan_area_button = button;
 
   /* autocorrect colors */
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
@@ -3496,7 +3459,7 @@ static void xsane_enhance_notebook(GtkWidget *notebook)
   /* apply button */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
 #ifdef HAVE_GTK2
   button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
@@ -3504,7 +3467,7 @@ static void xsane_enhance_notebook(GtkWidget *notebook)
   button = gtk_button_new_with_label(BUTTON_APPLY);
 #endif
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_enhance_apply_changes, NULL);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
   xsane_enhance_notebook_sensitivity(xsane_setup.lineart_mode);
@@ -3517,31 +3480,27 @@ static void xsane_enhance_notebook(GtkWidget *notebook)
 #ifdef HAVE_LIBLCMS
 static void xsane_color_management_notebook(GtkWidget *notebook)
 {
- GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text, *frame, *option_menu, *menu, *menu_item;
+ GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text, *option_menu, *menu, *menu_item;
  int selection = 0;
 
   DBG(DBG_proc, "xsane_color_management_notebook\n");
 
   /* color management options notebook page */
 
-  setup_vbox = gtk_vbox_new(FALSE, 5);
+  setup_vbox = gtk_vbox_new(FALSE, 0);
 
   label = gtk_label_new(NOTEBOOK_COLOR_MANAGEMENT_OPTIONS);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook), setup_vbox, label);
   gtk_widget_show(setup_vbox);
 
-  frame = gtk_frame_new(0);
-  gtk_container_set_border_width(GTK_CONTAINER(frame), 7);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(setup_vbox), frame, TRUE, TRUE, 0); /* sizeable framehight */
-  gtk_widget_show(frame);
-
-  vbox = gtk_vbox_new(FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
+  vbox = gtk_vbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(setup_vbox), vbox, TRUE, TRUE, 2); /* sizeable framehight */
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
   gtk_widget_show(vbox);
 
 
 
+
   /* black point compensation */
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
@@ -3846,7 +3805,7 @@ static void xsane_color_management_notebook(GtkWidget *notebook)
   /* apply button */
 
   hbox = gtk_hbox_new(/* homogeneous */ FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
 
 #ifdef HAVE_GTK2
   button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
@@ -3854,7 +3813,7 @@ static void xsane_color_management_notebook(GtkWidget *notebook)
   button = gtk_button_new_with_label(BUTTON_APPLY);
 #endif
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_color_management_apply_changes, NULL);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
   gtk_widget_show(hbox);
@@ -3865,7 +3824,7 @@ static void xsane_color_management_notebook(GtkWidget *notebook)
 
 void xsane_setup_dialog(GtkWidget *widget, gpointer data)
 {
- GtkWidget *setup_dialog, *setup_vbox, *hbox, *button, *notebook;
+ GtkWidget *setup_dialog, *setup_vbox, *hbox, *button_box, *button, *notebook;
  char buf[64];
 
   DBG(DBG_proc, "xsane_setup_dialog\n");
@@ -3913,18 +3872,22 @@ void xsane_setup_dialog(GtkWidget *widget, gpointer data)
 
   /* set the main hbox */
   hbox = gtk_hbox_new(FALSE, 0);
-  xsane_separator_new(setup_vbox, 2);
-  gtk_box_pack_end(GTK_BOX(setup_vbox), hbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
+  gtk_box_pack_end(GTK_BOX(setup_vbox), hbox, FALSE, FALSE, 4);
+  gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
   gtk_widget_show(hbox);   
 
+  button_box = gtk_hbox_new(TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button_box, FALSE, FALSE, 0);
+  gtk_container_set_border_width(GTK_CONTAINER(button_box), 0);
+  gtk_widget_show(button_box);   
+
 #ifdef HAVE_GTK2
   button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 #else
   button = gtk_button_new_with_label(BUTTON_CANCEL);
 #endif
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_close_setup_dialog_callback, setup_dialog);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(button_box), button, TRUE, TRUE, 8);
   gtk_widget_show(button);
 
 #ifdef HAVE_GTK2
@@ -3934,7 +3897,7 @@ void xsane_setup_dialog(GtkWidget *widget, gpointer data)
 #endif
   GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_setup_options_ok_callback, setup_dialog);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(button_box), button, TRUE, TRUE, 0);
   gtk_widget_grab_default(button);
   gtk_widget_show(button);
 
diff --git a/src/xsane-text.h b/src/xsane-text.h
index 59c6317..6cf74d8 100644
--- a/src/xsane-text.h
+++ b/src/xsane-text.h
@@ -48,7 +48,7 @@
 #define WINDOW_FAX_PROJECT				_("fax project")
 #define WINDOW_FAX_PROJECT_BROWSE			_("browse for fax project")
 #define WINDOW_FAX_RENAME				_("rename fax page")
-#define WINDOW_FAX_INSERT				_("insert ps-file into fax")
+#define WINDOW_FAX_INSERT				_("insert PS-file into fax")
 #define WINDOW_EMAIL_PROJECT				_("E-mail project")
 #define WINDOW_EMAIL_PROJECT_BROWSE			_("browse for email project")
 #define WINDOW_EMAIL_RENAME				_("rename e-mail image")
@@ -161,22 +161,21 @@
 #define RADIO_BUTTON_SAVE_DEVPREFS_AT_EXIT		_("Save device preferences at exit")
 #define RADIO_BUTTON_OVERWRITE_WARNING			_("Overwrite warning")
 #define RADIO_BUTTON_SKIP_EXISTING_NRS			_("Skip existing filenames")
-#define RADIO_BUTTON_SAVE_PS_FLATEDECODED		_("Save postscript zlib compressed (ps level 3)")
+#define RADIO_BUTTON_SAVE_PS_FLATEDECODED		_("Save postscript zlib compressed (PS level 3)")
 #define RADIO_BUTTON_SAVE_PDF_FLATEDECODED		_("Save PDF zlib compressed")
-#define RADIO_BUTTON_SAVE_PNM16_AS_ASCII		_("Save 16bit pnm in ascii format")
+#define RADIO_BUTTON_SAVE_PNM16_AS_ASCII		_("Save 16bit PNM in ASCII format")
 #define RADIO_BUTTON_REDUCE_16BIT_TO_8BIT		_("Reduce 16 bit image to 8 bit")
 #define RADIO_BUTTON_WINDOW_FIXED			_("Main window size fixed")
 #define RADIO_BUTTON_DISABLE_GIMP_PREVIEW_GAMMA		_("Disable GIMP preview gamma")
 #define RADIO_BUTTON_PRIVATE_COLORMAP			_("Use private colormap")
 #define RADIO_BUTTON_AUTOENHANCE_GAMMA  		_("Autoenhance gamma")
-#define RADIO_BUTTON_PRESELECT_SCANAREA 		_("Preselect scanarea")
+#define RADIO_BUTTON_PRESELECT_SCAN_AREA 		_("Preselect scan area")
 #define RADIO_BUTTON_AUTOCORRECT_COLORS 		_("Autocorrect colors")
 #define RADIO_BUTTON_OCR_USE_GUI_PIPE			_("Use GUI progress pipe")
 #define RADIO_BUTTON_CMS_BPC				_("Black point compensation")
 
 #define TEXT_SCANNING_DEVICES				_("scanning for devices")
 #define TEXT_AVAILABLE_DEVICES				_("Available devices:")
-#define TEXT_XSANE_OPTIONS				_("XSane options")
 #define TEXT_FILETYPE					_("Type")
 #define TEXT_CMS_FUNCTION				_("Color management function")
 #define TEXT_SCANNER_BACKEND				_("Scanner and backend:")
@@ -274,21 +273,24 @@
 #define TEXT_SETUP_PRINTER_NAME				_("Name:")
 #define TEXT_SETUP_PRINTER_CMD				_("Command:")
 #define TEXT_SETUP_COPY_NR_OPT				_("Copy number option:")
-#define TEXT_SETUP_PRINTER_LINEART_RES			_("Lineart resolution (dpi):")
-#define TEXT_SETUP_PRINTER_GRAYSCALE_RES		_("Grayscale resolution (dpi):")
-#define TEXT_SETUP_PRINTER_COLOR_RES			_("Color resolution (dpi):")
-#define TEXT_SETUP_PRINTER_WIDTH			_("Width")
-#define TEXT_SETUP_PRINTER_HEIGHT			_("Height")
-#define TEXT_SETUP_PRINTER_LEFT				_("Left offset")
-#define TEXT_SETUP_PRINTER_BOTTOM			_("Bottom offset")
-#define TEXT_SETUP_PRINTER_GAMMA			_("Printer gamma value:")
-#define TEXT_SETUP_PRINTER_GAMMA_RED			_("Printer gamma red:")
-#define TEXT_SETUP_PRINTER_GAMMA_GREEN			_("Printer gamma green:")
-#define TEXT_SETUP_PRINTER_GAMMA_BLUE			_("Printer gamma blue:")
+#define TEXT_SETUP_SCAN_RESOLUTION_PRINTER		_("Scan resolution:")
+#define TEXT_SETUP_PRINTER_LINEART_RES			_("lineart [dpi]")
+#define TEXT_SETUP_PRINTER_GRAYSCALE_RES		_("grayscale [dpi]")
+#define TEXT_SETUP_PRINTER_COLOR_RES			_("color [dpi]")
+#define TEXT_SETUP_PRINTER_PAPER_GEOMETRIE		_("Paper geometrie:")
+#define TEXT_SETUP_PRINTER_WIDTH			_("width")
+#define TEXT_SETUP_PRINTER_HEIGHT			_("height")
+#define TEXT_SETUP_PRINTER_LEFT				_("left offset")
+#define TEXT_SETUP_PRINTER_BOTTOM			_("bottom offset")
+#define TEXT_SETUP_PRINTER_GAMMA_CORRECTION		_("Printer gamma:")
+#define TEXT_SETUP_PRINTER_GAMMA			_("common value")
+#define TEXT_SETUP_PRINTER_GAMMA_RED			_("red")
+#define TEXT_SETUP_PRINTER_GAMMA_GREEN			_("green")
+#define TEXT_SETUP_PRINTER_GAMMA_BLUE			_("blue")
 #define TEXT_SETUP_PRINTER_EMBED_CSA			_("Embed scanner ICM profile as CSA")
 #define TEXT_SETUP_PRINTER_EMBED_CRD			_("Embed printer ICM profile as CRD")
 #define TEXT_SETUP_PRINTER_CMS_BPC			_("Apply black point compensation")
-#define TEXT_SETUP_PRINTER_PS_FLATEDECODED		_("Create zlib compressed postscript image (ps level 3) for printing")
+#define TEXT_SETUP_PRINTER_PS_FLATEDECODED		_("Create zlib compressed postscript image (PS level 3) for printing")
 #define TEXT_SETUP_TMP_PATH				_("Temporary directory")
 #define TEXT_SETUP_IMAGE_PERMISSION			_("Image-file permissions")
 #define TEXT_SETUP_DIR_PERMISSION			_("Directory permissions")
@@ -324,7 +326,7 @@
 #define TEXT_SETUP_FAX_HEIGHT				_("Height")
 #define TEXT_SETUP_FAX_LEFT				_("Left offset")
 #define TEXT_SETUP_FAX_BOTTOM				_("Bottom offset")
-#define TEXT_SETUP_FAX_PS_FLATEDECODED			_("Create zlib compressed postscript image (ps level 3) for fax")
+#define TEXT_SETUP_FAX_PS_FLATEDECODED			_("Create zlib compressed postscript image (PS level 3) for fax")
 #define TEXT_SETUP_SMTP_SERVER				_("SMTP server:")
 #define TEXT_SETUP_SMTP_PORT				_("SMTP port:")
 #define TEXT_SETUP_EMAIL_FROM				_("From:")
@@ -426,8 +428,8 @@
 #define MENU_ITEM_COUNTER_LEN_INACTIVE	_("inactive")
 #define MENU_ITEM_TIFF_COMP_NONE	_("no compression")
 #define MENU_ITEM_TIFF_COMP_CCITTRLE	_("CCITT 1D Huffman compression")
-#define MENU_ITEM_TIFF_COMP_CCITFAX3	_("CCITT Group 3 Fax compression")
-#define MENU_ITEM_TIFF_COMP_CCITFAX4	_("CCITT Group 4 Fax compression")
+#define MENU_ITEM_TIFF_COMP_CCITFAX3	_("CCITT Group 3 fax compression")
+#define MENU_ITEM_TIFF_COMP_CCITFAX4	_("CCITT Group 4 fax compression")
 #define MENU_ITEM_TIFF_COMP_JPEG	_("JPEG DCT compression")
 #define MENU_ITEM_TIFF_COMP_PACKBITS	_("pack bits")
 #define MENU_ITEM_TIFF_COMP_DEFLATE	_("deflate")
@@ -467,7 +469,7 @@
 #define PROGRESS_RECEIVING_FRAME_DATA	_("Receiving %s data")
 #define PROGRESS_PAGE			_("page")
 
-#define PROGRESS_TRANSFERING_DATA	_("Transfering image")
+#define PROGRESS_TRANSFERRING_DATA	_("Transferring image")
 #define PROGRESS_ROTATING_DATA		_("Rotating image")
 #define PROGRESS_MIRRORING_DATA		_("Mirroring image")
 #define PROGRESS_PACKING_DATA		_("Packing image")
@@ -487,7 +489,7 @@
 #define DESC_XSANE_MODE			_("viewer-<Ctrl-v>, save-<Ctrl-s>, photocopy-<Ctrl-c>, " \
 					  "multipage-<Ctrl-m>, fax-<Ctrl-f> or e-mail-<Ctrl-e>")
 #define DESC_XSANE_MEDIUM		_("Select source medium type.\n" \
-					  "To rename, reorder or delete an entry use context menu (right mouse button).\n"\
+					  "To rename, reorder or delete an entry use context menu (alternate mouse button).\n"\
 					  "To create a medium enable the option edit medium definition in preferences menu.")
 
 #define DESC_FILENAME_COUNTER_STEP	_("Value that is added to filenamecounter after scan")
@@ -584,22 +586,22 @@
                                           "The printer has to understand postscript level 3!")
 #define DESC_TMP_PATH			_("Path to temp directory")
 #define DESC_BUTTON_TMP_PATH_BROWSE	_("Browse for temporary directory")
-#define DESC_JPEG_QUALITY		_("Quality in percent if image is saved as jpeg or tiff with jpeg compression")
-#define DESC_PNG_COMPRESSION		_("Compression if image is saved as png")
+#define DESC_JPEG_QUALITY		_("Quality in percent if image is saved as JPEG or TIFF with JPEG compression")
+#define DESC_PNG_COMPRESSION		_("Compression if image is saved as PNG")
 #define DESC_FILENAME_COUNTER_LEN	_("Minimum length of counter in filename")
-#define DESC_TIFF_ZIP_COMPRESSION	_("Compression rate for zip compressed tiff (deflate)")
-#define DESC_TIFF_COMPRESSION_16	_("Compression type if 16 bit image is saved as tiff")
-#define DESC_TIFF_COMPRESSION_8		_("Compression type if 8 bit image is saved as tiff")
-#define DESC_TIFF_COMPRESSION_1		_("Compression type if lineart image is saved as tiff")
+#define DESC_TIFF_ZIP_COMPRESSION	_("Compression rate for zip compressed TIFF (deflate)")
+#define DESC_TIFF_COMPRESSION_16	_("Compression type if 16 bit image is saved as TIFF")
+#define DESC_TIFF_COMPRESSION_8		_("Compression type if 8 bit image is saved as TIFF")
+#define DESC_TIFF_COMPRESSION_1		_("Compression type if lineart image is saved as TIFF")
 #define DESC_SAVE_DEVPREFS_AT_EXIT	_("Save device dependant preferences in default file at exit of xsane")
 #define DESC_OVERWRITE_WARNING		_("Warn before overwriting an existing file")
 #define DESC_SKIP_EXISTING		_("If filename counter is automatically increased, used numbers are skipped")
 #define DESC_SAVE_PS_FLATEDECODED	_("compress postscript image with zlib algorithm (flatedecode). " \
                                           "When you want to print such a file your printer has to understand postscript level 3")
 #define DESC_SAVE_PDF_FLATEDECODED	_("compress PDF image with zlib algorithm (flatedecode).")
-#define DESC_SAVE_PNM16_AS_ASCII	_("When a 16 bit image shall be saved in pnm format then use ascii format " \
+#define DESC_SAVE_PNM16_AS_ASCII	_("When a 16 bit image shall be saved in PNM format then use ASCII format " \
                                           "instead of binary format. The binary format is a new format that is not " \
-                                          "supported by all programs. The ascii format is supported by more programs " \
+                                          "supported by all programs. The ASCII format is supported by more programs " \
                                           "but it produces really huge files!!!")
 #define DESC_REDUCE_16BIT_TO_8BIT	_("If scanner sends image with 16 bits/channel save image with 8 bits/channel")
 #define DESC_PSFILE_WIDTH		_("Width of paper for postscript files")
@@ -610,7 +612,7 @@
 #define DESC_DISABLE_GIMP_PREVIEW_GAMMA	_("Disable preview gamma when XSane runs as GIMP plugin")
 #define DESC_PREVIEW_COLORMAP		_("Use an own colormap for preview if display depth is 8 bpp")
 #define DESC_SHOW_RANGE_MODE		_("Select how a range is displayed")
-#define DESC_PREVIEW_OVERSAMPLING	_("Value with that the calculated preview resolution is multiplied")
+#define DESC_PREVIEW_OVERSAMPLING	_("Value with which the calculated preview resolution is multiplied")
 #define DESC_PREVIEW_GAMMA		_("Set gamma correction value for preview image")
 #define DESC_PREVIEW_GAMMA_RED		_("Set gamma correction value for red component of preview image")
 #define DESC_PREVIEW_GAMMA_GREEN	_("Set gamma correction value for green component of preview image")
@@ -625,9 +627,9 @@
 #define DESC_PREVIEW_THRESHOLD_OFF      _("Offset to make XSane threshold range and scanner threshold range the same")
 #define DESC_ADF_PAGES_MAX		_("Number of pages to scan")
 #define DESC_PREVIEW_PIPETTE_RANGE	_("dimension of square that is used to average color for pipette function")
-#define DESC_DOC_VIEWER			_("Enter command to be executed to display helpfiles, must be a html-viewer!")
+#define DESC_DOC_VIEWER			_("Enter command to be executed to display helpfiles, must be a HTML-viewer!")
 #define DESC_AUTOENHANCE_GAMMA		_("Change gamma value when autoenhancement button is pressed")
-#define DESC_PRESELECT_SCANAREA		_("Select scanarea after preview scan has finished")
+#define DESC_PRESELECT_SCAN_AREA	_("Select scan area after preview scan has finished")
 #define DESC_AUTOCORRECT_COLORS		_("Do color correction after preview scan has finished")
 
 #define DESC_RENDERING_INTENT		_("Select rendering intent for preview and saving")
@@ -654,12 +656,12 @@
 #define DESC_EMAIL_AUTH_PASS		_("password for e-mail server")
 #define DESC_POP3_SERVER		_("IP Address or Domain name of POP3 server")
 #define DESC_POP3_PORT			_("port to connect to POP3 server")
-#define DESC_HTML_EMAIL			_("E-mail is sent in html mode, place image with: <IMAGE>")
-#define DESC_OCR_COMMAND		_("Enter command to start ocr program")
-#define DESC_OCR_INPUTFILE_OPT		_("Enter option of the ocr program to define input file")
-#define DESC_OCR_OUTPUTFILE_OPT		_("Enter option of the ocr program to define output file")
-#define DESC_OCR_USE_GUI_PIPE_OPT	_("Define if the ocr program supports gui progress pipe")
-#define DESC_OCR_OUTFD_OPT		_("Enter option of the ocr program to define output filedescripor in GUI mode")
+#define DESC_HTML_EMAIL			_("E-mail is sent in HTML mode, place image with: <IMAGE>")
+#define DESC_OCR_COMMAND		_("Enter command to start OCR program")
+#define DESC_OCR_INPUTFILE_OPT		_("Enter option of the OCR program to define input file")
+#define DESC_OCR_OUTPUTFILE_OPT		_("Enter option of the OCR program to define output file")
+#define DESC_OCR_USE_GUI_PIPE_OPT	_("Define if the OCR program supports gui progress pipe")
+#define DESC_OCR_OUTFD_OPT		_("Enter option of the OCR program to define output filedescripor in GUI mode")
 #define DESC_OCR_PROGRESS_KEYWORD	_("Define Keyword that is used to mark progress information")
 
 #define DESC_PERMISSION_READ		_("read")
@@ -671,19 +673,19 @@
 #define DESC_PIPETTE_GRAY		_("Pick gray point")
 #define DESC_PIPETTE_BLACK		_("Pick black point")
 
-#define DESC_ZOOM_FULL			_("Use full scanarea")
+#define DESC_ZOOM_FULL			_("Use full scan area")
 #define DESC_ZOOM_OUT			_("Zoom 20% out")
 #define DESC_ZOOM_IN			_("Click at position to zoom to")
 #define DESC_ZOOM_AREA			_("Zoom into selected area")
 #define DESC_ZOOM_UNDO			_("Undo last zoom")
 
 #define DESC_FULL_PREVIEW_AREA		_("Select visible area")
-#define DESC_AUTOSELECT_SCANAREA	_("Autoselect scanarea")
-#define DESC_AUTORAISE_SCANAREA		_("Autoraise scanarea")
+#define DESC_AUTOSELECT_SCAN_AREA	_("Autoselect scan area")
+#define DESC_AUTORAISE_SCAN_AREA	_("Autoraise scan area")
 #define DESC_DELETE_IMAGES		_("Delete preview image cache")
 
 #define DESC_PRESET_AREA		_("Preset area:\n" \
-					  "To add new area or edit an existing area use contect menu (right mouse button).")
+					  "To add new area or edit an existing area use context menu (alternate mouse button).")
 #define DESC_ROTATION			_("Rotate preview and scan")
 #define DESC_RATIO			_("Aspect ratio of selection")
 #define DESC_PAPER_ORIENTATION		_("Define image position for printing")
@@ -695,9 +697,9 @@
 #define DESC_VIEWER_SCALE		_("Scale image")
 #define DESC_VIEWER_DESPECKLE		_("Despeckle image")
 #define DESC_VIEWER_BLUR		_("Blur image")
-#define DESC_ROTATE90			_("Rotate image 90 degree")
-#define DESC_ROTATE180			_("Rotate image 180 degree")
-#define DESC_ROTATE270			_("Rotate image 270 degree")
+#define DESC_ROTATE90			_("Rotate image 90 degrees")
+#define DESC_ROTATE180			_("Rotate image 180 degrees")
+#define DESC_ROTATE270			_("Rotate image 270 degrees")
 #define DESC_MIRROR_X			_("Mirror image at vertical axis")
 #define DESC_MIRROR_Y			_("Mirror image at horizontal axis")
 #define DESC_VIEWER_ZOOM		_("Zoom image")
@@ -706,8 +708,8 @@
 #define DESC_SCALE_FACTOR		_("Scale factor")
 #define DESC_X_SCALE_FACTOR		_("X-Scale factor")
 #define DESC_Y_SCALE_FACTOR		_("Y-Scale factor")
-#define DESC_SCALE_WIDTH		_("Scale image to width [in pixel]")
-#define DESC_SCALE_HEIGHT		_("Scale image to height [in pixel]")
+#define DESC_SCALE_WIDTH		_("Scale image to width [pixels]")
+#define DESC_SCALE_HEIGHT		_("Scale image to height [pixels]")
 #define DESC_BATCH_LIST_EMPTY		_("Empty batch list")
 #define DESC_BATCH_LIST_SAVE		_("Save batch list")
 #define DESC_BATCH_LIST_LOAD		_("Load batch list")
@@ -748,7 +750,7 @@ write permissions." )
 #define ERR_BAD_DEPTH			_("Can't handle depth")
 #define ERR_UNKNOWN_SAVING_FORMAT	_("Unknown file format for saving")
 #define ERR_OPEN_FAILED			_("Failed to open")
-#define ERR_CREATE_SECURE_FILE		_("Could not create secure file (may be a link does exist):")
+#define ERR_CREATE_SECURE_FILE		_("Could not create secure file (maybe a link does exist):")
 #define ERR_FAILED_PRINTER_PIPE		_("Failed to open pipe for executing printercommand")
 #define ERR_FAILED_EXEC_PRINTER_CMD	_("Failed to execute printercommand:")
 #define ERR_FAILED_START_SCANNER	_("Failed to start scanner:")
@@ -767,7 +769,7 @@ write permissions." )
 #define ERR_FAILED_EXEC_DOC_VIEWER	_("Failed to execute documentation viewer:")
 #define ERR_FAILED_EXEC_FAX_VIEWER	_("Failed to execute fax viewer:")
 #define ERR_FAILED_EXEC_FAX_CMD		_("Failed to execute fax command:")
-#define ERR_FAILED_EXEC_OCR_CMD		_("Failed to execute ocr command:")
+#define ERR_FAILED_EXEC_OCR_CMD		_("Failed to execute OCR command:")
 #define ERR_BAD_FRAME_FORMAT		_("bad frame format")
 #define ERR_FAILED_SET_RESOLUTION	_("unable to set resolution")
 #define ERR_PASSWORD_FILE_INSECURE	_("Password file (%s) is insecure, use permission x00\n")
@@ -788,7 +790,7 @@ write permissions." )
 #define WARN_NO_VALUE_CONSTRAINT	_("warning: option has no value constraint")
 #define WARN_XSANE_AS_ROOT		_("You try to run XSane as ROOT, that really is DANGEROUS!\n\n\
 Do not send any bug reports when you\n\
-have any problem while running XSane as root:\n\
+have any problems while running XSane as root:\n\
 YOU ARE ALONE!\
 ")
 
@@ -877,7 +879,7 @@ The format of [DEVICE] is backendname:devicefile (e.g. umax:/dev/scanner).\n\
 				"2) Supported devices are busy\n" \
 				"3) The permissions for the device file do not allow you to use it - try as root\n" \
 				"4) The backend is not loaded by SANE (man sane-dll)\n" \
-				"5) The backend is not configured correct (man sane-\"backendname\")\n" \
+				"5) The backend is not configured correctly (man sane-\"backendname\")\n" \
 				"6) Possibly there is more than one SANE version installed" )
 
 /* strings that are used in structures, so it is not allowed to use _()/gettext() here */
@@ -933,7 +935,7 @@ The format of [DEVICE] is backendname:devicefile (e.g. umax:/dev/scanner).\n\
 #define TEXT_EMAIL_STATUS_SENDING		N_("Sending e-mail")
 #define TEXT_EMAIL_STATUS_SENT			N_("E-mail has been sent")
 
-#define TEXT_FAX_STATUS_QUEUEING_FAX		N_("Queueing Fax")
+#define TEXT_FAX_STATUS_QUEUEING_FAX		N_("Queueing fax")
 #define TEXT_FAX_STATUS_FAX_QUEUED		N_("Fax is queued")
 
 #endif
diff --git a/src/xsane-viewer.c b/src/xsane-viewer.c
index ef47529..57abd98 100644
--- a/src/xsane-viewer.c
+++ b/src/xsane-viewer.c
@@ -1095,7 +1095,7 @@ static void xsane_viewer_scale_image(GtkWidget *window, gpointer data)
 
   gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), PROGRESS_SCALING_DATA);
 
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
 
   if (v->bind_scale)
   {
@@ -1108,7 +1108,7 @@ static void xsane_viewer_scale_image(GtkWidget *window, gpointer data)
   fclose(outfile);
 
   gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), "");
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
 
   if (v->undo_filename)
   {
@@ -1177,7 +1177,7 @@ static void xsane_viewer_despeckle_image(GtkWidget *window, gpointer data)
 
   gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), PROGRESS_DESPECKLING_DATA);
 
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
 
   xsane_save_despeckle_image(outfile, infile, &image_info, v->despeckle_radius, v->progress_bar, &v->cancel_save);
 
@@ -1185,7 +1185,7 @@ static void xsane_viewer_despeckle_image(GtkWidget *window, gpointer data)
   fclose(outfile);
 
   gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), "");
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
 
   if (v->undo_filename)
   {
@@ -1254,7 +1254,7 @@ static void xsane_viewer_blur_image(GtkWidget *window, gpointer data)
 
   gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), PROGRESS_BLURING_DATA);
 
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
 
   xsane_save_blur_image(outfile, infile, &image_info, v->blur_radius, v->progress_bar, &v->cancel_save);
 
@@ -1262,7 +1262,7 @@ static void xsane_viewer_blur_image(GtkWidget *window, gpointer data)
   fclose(outfile);
 
   gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), "");
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
 
   if (v->undo_filename)
   {
@@ -1344,7 +1344,7 @@ static void xsane_viewer_rotate(Viewer *v, int rotation)
     gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), PROGRESS_MIRRORING_DATA);
   }
 
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
 
   xsane_save_rotate_image(outfile, infile, &image_info, rotation, v->progress_bar, &v->cancel_save);
 
@@ -1352,7 +1352,7 @@ static void xsane_viewer_rotate(Viewer *v, int rotation)
   fclose(outfile);
 
   gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), "");
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
+  xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(v->progress_bar), 0.0);
 
   if (v->undo_filename)
   {
@@ -2864,7 +2864,7 @@ Viewer *xsane_viewer_new(char *filename, char *selection_filetype, int allow_red
     snprintf(buf, sizeof(buf), "%s %s", WINDOW_VIEWER, xsane.device_text);
   }
 
-  xsane_viewer_read_image_header(v); // xxx oli
+  xsane_viewer_read_image_header(v);
 
   v->top = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title(GTK_WINDOW(v->top), buf);
diff --git a/src/xsane.c b/src/xsane.c
index 38ee7d1..7c5c5fa 100644
--- a/src/xsane.c
+++ b/src/xsane.c
@@ -1181,7 +1181,6 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
  GtkWidget *xsane_vbox_xsane_modus;
  GtkWidget *xsane_spinbutton;
  GtkWidget *xsane_hbox_xsane_enhancement;
- GtkWidget *xsane_frame;
  GtkWidget *xsane_medium_option_menu, *xsane_medium_menu, *xsane_medium_item;
  GtkWidget *button;
  GtkWidget *pixmapwidget;
@@ -1202,49 +1201,38 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
 /*  gtk_box_pack_start(GTK_BOX(xsane_hbox), xsane_vbox, FALSE, FALSE, 0); */ /* make scales fixed */
   gtk_box_pack_start(GTK_BOX(xsane_hbox), xsane_vbox, TRUE, TRUE, 0); /* make scales sizeable */
 
-  /* XSane Frame */
-
-  xsane_frame = gtk_frame_new(TEXT_XSANE_OPTIONS);
-  gtk_container_set_border_width(GTK_CONTAINER(xsane_frame), 4);
-  gtk_frame_set_shadow_type(GTK_FRAME(xsane_frame), GTK_SHADOW_ETCHED_IN);
-/*  gtk_box_pack_start(GTK_BOX(xsane_vbox), xsane_frame, FALSE, FALSE, 0); */ /* fixed frameheight */
-  gtk_box_pack_start(GTK_BOX(xsane_vbox), xsane_frame, TRUE, TRUE, 0); /* sizeable framehight */
-  gtk_widget_show(xsane_frame);
-
-  xsane_vbox_xsane_modus = gtk_vbox_new(FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(xsane_frame), xsane_vbox_xsane_modus);
+  xsane_vbox_xsane_modus = gtk_vbox_new(FALSE, 2);
+  gtk_box_pack_start(GTK_BOX(xsane_vbox), xsane_vbox_xsane_modus, TRUE, TRUE, 0); /* sizeable framehight */
   gtk_widget_show(xsane_vbox_xsane_modus);
 
-/* scan copy fax selection */
+  /* ADF pages selection */
+  hbox = gtk_hbox_new(FALSE, 5);
+  gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 2);
+  gtk_widget_show(hbox);
+
+  pixmap = gdk_pixmap_create_from_xpm_d(xsane.histogram_dialog->window, &mask, xsane.bg_trans, (gchar **) adf_xpm);
+  pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask);
+  gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 2);
+  gdk_drawable_unref(pixmap);
+  gtk_widget_show(pixmapwidget);
 
+  /* adf pages maximum */
+  adjustment = gtk_adjustment_new(preferences.adf_pages_max, 1, 9999, 1, 10, 1);
+  xsane_spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 0, 0);
+  gtk_widget_set_size_request(xsane_spinbutton, 55, -1);
+  gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(xsane_spinbutton), FALSE);
+  xsane_back_gtk_set_tooltip(xsane.tooltips, xsane_spinbutton, DESC_ADF_PAGES_MAX);
+  g_signal_connect(GTK_OBJECT(xsane_spinbutton), "changed", (GtkSignalFunc) xsane_adf_pages_max_callback, NULL);
+  xsane.adf_pages_max_entry = xsane_spinbutton;
+  gtk_box_pack_start(GTK_BOX(hbox), xsane_spinbutton, FALSE, FALSE, 5);
+  gtk_widget_show(xsane_spinbutton);
+
+  /* scan copy fax selection, in hbox of ADF pages */
   if ( (xsane.mode == XSANE_STANDALONE) && (xsane.mode_selection) ) /* display xsane mode selection menu */
   {
-    hbox = gtk_hbox_new(FALSE, 2);
-    gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
-    gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 1);
-
-    pixmap = gdk_pixmap_create_from_xpm_d(xsane.histogram_dialog->window, &mask, xsane.bg_trans, (gchar **) adf_xpm);
-    pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask);
-    gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 2);
-    gdk_drawable_unref(pixmap);
-    gtk_widget_show(pixmapwidget);
-
-    /* adf pages maximum */
-    adjustment = gtk_adjustment_new(preferences.adf_pages_max, 1, 9999, 1, 10, 1);
-    xsane_spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 0, 0);
-    gtk_widget_set_size_request(xsane_spinbutton, 55, -1);
-    gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(xsane_spinbutton), FALSE);
-    xsane_back_gtk_set_tooltip(xsane.tooltips, xsane_spinbutton, DESC_ADF_PAGES_MAX);
-    g_signal_connect(GTK_OBJECT(xsane_spinbutton), "changed", (GtkSignalFunc) xsane_adf_pages_max_callback, NULL);
-    xsane.adf_pages_max_entry = xsane_spinbutton;
-    gtk_box_pack_start(GTK_BOX(hbox), xsane_spinbutton, FALSE, FALSE, 10);
-    gtk_widget_show(xsane_spinbutton);
-
-
     xsane_modus_menu = gtk_menu_new();
     gtk_menu_set_accel_group(GTK_MENU(xsane_modus_menu), xsane.accelerator_group);
 
-
     xsane_modus_item = gtk_menu_item_new_with_label(MENU_ITEM_VIEWER);
     gtk_widget_add_accelerator(xsane_modus_item, "activate", xsane.accelerator_group, GDK_V, GDK_CONTROL_MASK, DEF_GTK_MENU_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED);
     gtk_widget_set_size_request(xsane_modus_item, 60, -1);
@@ -1286,7 +1274,7 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
 
     xsane_modus_option_menu = gtk_option_menu_new();
     xsane_back_gtk_set_tooltip(xsane.tooltips, xsane_modus_option_menu, DESC_XSANE_MODE);
-    gtk_box_pack_end(GTK_BOX(hbox), xsane_modus_option_menu, FALSE, FALSE, 2);
+    gtk_box_pack_end(GTK_BOX(hbox), xsane_modus_option_menu, FALSE, FALSE, 5);
     gtk_option_menu_set_menu(GTK_OPTION_MENU(xsane_modus_option_menu), xsane_modus_menu);
     gtk_option_menu_set_history(GTK_OPTION_MENU(xsane_modus_option_menu), xsane.xsane_mode);
     gtk_widget_show(xsane_modus_option_menu);
@@ -1297,8 +1285,6 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
     gdk_drawable_unref(pixmap);
     gtk_widget_show(pixmapwidget);
 
-    gtk_widget_show(hbox);
-
     xsane.xsanemode_widget = xsane_modus_option_menu;
   }
 
@@ -1317,8 +1303,7 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
    GtkWidget *xsane_printer_option_menu, *xsane_printer_menu, *xsane_printer_item;
    GtkWidget *paper_orientation_option_menu, *paper_orientation_menu, *paper_orientation_item;
 
-    hbox = gtk_hbox_new(FALSE, 2);
-    gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
+    hbox = gtk_hbox_new(FALSE, 5);
     gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 2);
 
     pixmap = gdk_pixmap_create_from_xpm_d(xsane.histogram_dialog->window, &mask, xsane.bg_trans, (gchar **) printer_xpm);
@@ -1328,6 +1313,17 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
     gtk_widget_show(pixmapwidget);
 
 
+    /* number of copies */
+    adjustment = gtk_adjustment_new(xsane.copy_number, 1, 99, 1, 10, 1);
+    xsane_spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 0, 0);
+    gtk_widget_set_size_request(xsane_spinbutton, 40, -1);
+    gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(xsane_spinbutton), FALSE);
+    xsane_back_gtk_set_tooltip(xsane.tooltips, xsane_spinbutton, DESC_COPY_NUMBER);
+    xsane.copy_number_entry = xsane_spinbutton;
+    gtk_box_pack_start(GTK_BOX(hbox), xsane_spinbutton, FALSE, FALSE, 5);
+    gtk_widget_show(xsane_spinbutton);
+
+
     /* printer position */
     paper_orientation_menu = gtk_menu_new();
 
@@ -1402,7 +1398,7 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
 
     paper_orientation_option_menu = gtk_option_menu_new();
     xsane_back_gtk_set_tooltip(xsane.tooltips, paper_orientation_option_menu, DESC_PAPER_ORIENTATION);
-    gtk_box_pack_end(GTK_BOX(hbox), paper_orientation_option_menu, FALSE, FALSE, 0);
+    gtk_box_pack_end(GTK_BOX(hbox), paper_orientation_option_menu, FALSE, FALSE, 5);
     gtk_option_menu_set_menu(GTK_OPTION_MENU(paper_orientation_option_menu), paper_orientation_menu);
 
     /* set default selection */
@@ -1441,16 +1437,6 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
 
     gtk_option_menu_set_menu(GTK_OPTION_MENU(xsane_printer_option_menu), xsane_printer_menu);
     gtk_option_menu_set_history(GTK_OPTION_MENU(xsane_printer_option_menu), preferences.printernr);
-
-    /* number of copies */
-    adjustment = gtk_adjustment_new(xsane.copy_number, 1, 99, 1, 10, 1);
-    xsane_spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 0, 0);
-    gtk_widget_set_size_request(xsane_spinbutton, 40, -1);
-    gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(xsane_spinbutton), FALSE);
-    xsane_back_gtk_set_tooltip(xsane.tooltips, xsane_spinbutton, DESC_COPY_NUMBER);
-    xsane.copy_number_entry = xsane_spinbutton;
-    gtk_box_pack_start(GTK_BOX(hbox), xsane_spinbutton, FALSE, FALSE, 10);
-    gtk_widget_show(xsane_spinbutton);
   }
 
 #ifdef HAVE_LIBLCMS
@@ -1462,9 +1448,8 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
 	)
        )
     {
-      hbox = gtk_hbox_new(FALSE, 2);
-      gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
-      gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 1);
+      hbox = gtk_hbox_new(FALSE, 5);
+      gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 2);
       gtk_widget_show(hbox);
   
       pixmap = gdk_pixmap_create_from_xpm_d(xsane.histogram_dialog->window, &mask, xsane.bg_trans, (gchar **) cms_xpm);
@@ -1474,7 +1459,7 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
       gtk_widget_show(pixmapwidget);
   
       xsane.cms_function_option_menu = xsane_back_gtk_cms_function_menu_new(preferences.cms_function, (GtkSignalFunc) xsane_cms_function_menu_callback);
-      gtk_box_pack_end(GTK_BOX(hbox), xsane.cms_function_option_menu, FALSE, FALSE, 2);
+      gtk_box_pack_end(GTK_BOX(hbox), xsane.cms_function_option_menu, TRUE, TRUE, 5);
       gtk_widget_show(xsane.cms_function_option_menu);
     }
 #endif
@@ -1485,9 +1470,8 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
   {
     if (SANE_OPTION_IS_ACTIVE(opt->cap))
     {
-      hbox = gtk_hbox_new(FALSE, 2);
-      gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
-      gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 1);
+      hbox = gtk_hbox_new(FALSE, 5);
+      gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 2);
 
       pixmap = gdk_pixmap_create_from_xpm_d(xsane.histogram_dialog->window, &mask, xsane.bg_trans, (gchar **) scanner_xpm);
       pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask);
@@ -1525,9 +1509,8 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
   {
     if (SANE_OPTION_IS_ACTIVE(opt->cap))
     {
-      hbox = gtk_hbox_new(FALSE, 2);
-      gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
-      gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 1);
+      hbox = gtk_hbox_new(FALSE, 5);
+      gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 2);
 
       pixmap = gdk_pixmap_create_from_xpm_d(xsane.histogram_dialog->window, &mask, xsane.bg_trans, (gchar **) colormode_xpm);
       pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask);
@@ -1564,9 +1547,8 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
   if ((xsane.param.depth != 1) && (!xsane.enable_color_management))
   {
     /* medium selection */
-    hbox = gtk_hbox_new(FALSE, 2);
-    gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
-    gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 1);
+    hbox = gtk_hbox_new(FALSE, 5);
+    gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), hbox, FALSE, FALSE, 2);
 
     if (xsane.medium_calibration)
     {
@@ -1598,7 +1580,7 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
 
     xsane_medium_option_menu = gtk_option_menu_new();
     xsane_back_gtk_set_tooltip(xsane.tooltips, xsane_medium_option_menu, DESC_XSANE_MEDIUM);
-    gtk_box_pack_end(GTK_BOX(hbox), xsane_medium_option_menu, FALSE, FALSE, 2);
+    gtk_box_pack_end(GTK_BOX(hbox), xsane_medium_option_menu, TRUE, TRUE, 5);
     gtk_option_menu_set_menu(GTK_OPTION_MENU(xsane_medium_option_menu), xsane_medium_menu);
     gtk_option_menu_set_history(GTK_OPTION_MENU(xsane_medium_option_menu), preferences.medium_nr);
     gtk_widget_show(xsane_medium_option_menu);
@@ -1841,12 +1823,10 @@ GtkWidget *xsane_update_xsane_callback() /* creates the XSane option window */
                                 &xsane.contrast_blue,  &xsane.contrast_blue_widget, 0, xsane_gamma_changed, TRUE);
   }
 
-    xsane_separator_new(xsane_vbox_xsane_modus, 2);
 
   /* create lower button box (rgb default, negative ,... */
-  xsane_hbox_xsane_enhancement = gtk_hbox_new(TRUE, 4);
-  gtk_container_set_border_width(GTK_CONTAINER(xsane_hbox_xsane_enhancement), 4);
-  gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), xsane_hbox_xsane_enhancement, FALSE, FALSE, 0);
+  xsane_hbox_xsane_enhancement = gtk_hbox_new(TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(xsane_vbox_xsane_modus), xsane_hbox_xsane_enhancement, FALSE, FALSE, 3);
   gtk_widget_show(xsane_hbox_xsane_enhancement);
 
   if (xsane.xsane_channels > 1)
@@ -1899,7 +1879,7 @@ void xsane_pref_save(void)
 
   /* first save xsane-specific preferences: */
   xsane_back_gtk_make_path(sizeof(filename), filename, "xsane", NULL, NULL, xsane.xsane_rc_set_filename, ".rc", XSANE_PATH_LOCAL_SANE);
-//  xsane_back_gtk_make_path(sizeof(filename), filename, "xsane", NULL, "xsane", NULL, ".rc", XSANE_PATH_LOCAL_SANE);
+/* old version:  xsane_back_gtk_make_path(sizeof(filename), filename, "xsane", NULL, "xsane", NULL, ".rc", XSANE_PATH_LOCAL_SANE); */
 
   DBG(DBG_info2, "saving preferences to \"%s\"\n", filename);
 
@@ -1931,7 +1911,7 @@ static int xsane_pref_restore(void)
   DBG(DBG_proc, "xsane_pref_restore\n");
 
   xsane_back_gtk_make_path(sizeof(filename), filename, "xsane", NULL, NULL, xsane.xsane_rc_set_filename, ".rc", XSANE_PATH_LOCAL_SANE);
-//  xsane_back_gtk_make_path(sizeof(filename), filename, "xsane", NULL, "xsane", NULL, ".rc", XSANE_PATH_LOCAL_SANE);
+/* old version:  xsane_back_gtk_make_path(sizeof(filename), filename, "xsane", NULL, "xsane", NULL, ".rc", XSANE_PATH_LOCAL_SANE); */
   fd = open(filename, O_RDONLY);
 
   if (fd >= 0)
@@ -4886,7 +4866,7 @@ void xsane_panel_build()
 
 static void xsane_device_dialog(void)
 {
- GtkWidget *vbox, *hbox, *button, *frame, *infobox;
+ GtkWidget *hbox, *button, *frame, *infobox, *table;
  GtkWidget *menubar, *menubar_item;
  GtkStyle *current_style;
  const gchar *devname;
@@ -4906,7 +4886,6 @@ static void xsane_device_dialog(void)
 
   devname = xsane.devlist[xsane.selected_dev]->name;
 
-/*  status = sane_open(devname, (SANE_Handle *) &xsane.dev); // old version */
   status = sane_open(devname, &sane_handle);
   xsane.dev = sane_handle;
 
@@ -5080,7 +5059,7 @@ static void xsane_device_dialog(void)
   /* "Help" submenu: */
   menubar_item = gtk_menu_item_new_with_label(MENU_HELP);
   gtk_container_add(GTK_CONTAINER(menubar), menubar_item);
-  gtk_menu_item_right_justify((GtkMenuItem *) menubar_item);
+ /*  gtk_menu_item_right_justify((GtkMenuItem *) menubar_item); */
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_item), xsane_help_build_menu());
 /*  gtk_widget_add_accelerator(menubar_item, "select", xsane.accelerator_group, GDK_H, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); */
   gtk_widget_show(menubar_item);
@@ -5246,55 +5225,50 @@ static void xsane_device_dialog(void)
   /* create batch_scan dialog */
   xsane_create_batch_scan_dialog(xsane.device_text);
 
-  /* The bottom area: info frame, progress bar, start and cancel button */
-  hbox = gtk_hbox_new(FALSE, 3);
-  gtk_box_pack_end(GTK_BOX(xsane_window), hbox, FALSE, FALSE, 0);
-  gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
+
+  /* create the progress bar / info box, scan and cancel button */
+  hbox = gtk_hbox_new(FALSE, 6);
+  gtk_box_pack_end(GTK_BOX(xsane_window), hbox, FALSE, FALSE, 8);
   gtk_widget_show(hbox);
 
+  table = gtk_table_new(2, 2, FALSE);
+  gtk_box_pack_start(GTK_BOX(hbox), table, TRUE, TRUE, 8);
+  gtk_widget_show(table);
 
-  /* vertical box for info frame and progress bar */
-  vbox = gtk_vbox_new(FALSE, 3);
-  gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
-  gtk_widget_show(vbox);
+  gtk_table_set_row_spacings(GTK_TABLE(table), 6);
+  gtk_table_set_col_spacings(GTK_TABLE(table), 6);
 
 
   /* Info frame */
   frame = gtk_frame_new(0);
   gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
-  gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
   gtk_widget_show(frame);
-
-  infobox = gtk_hbox_new(FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER(infobox), 4);
+  infobox = gtk_hbox_new(FALSE, 0);
   gtk_container_add(GTK_CONTAINER(frame), infobox);
   gtk_widget_show(infobox);
-
   xsane.info_label = gtk_label_new(TEXT_INFO_BOX);
-  gtk_box_pack_start(GTK_BOX(infobox), xsane.info_label, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(infobox), xsane.info_label, TRUE, TRUE, 2);
   gtk_widget_show(xsane.info_label);
+  gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
+
 
   /* progress bar */
   xsane.progress_bar = (GtkProgressBar *) gtk_progress_bar_new();
-  gtk_box_pack_start(GTK_BOX(vbox), (GtkWidget *) xsane.progress_bar, TRUE, TRUE, 0);
   gtk_progress_set_show_text(GTK_PROGRESS(xsane.progress_bar), TRUE);
   gtk_progress_set_format_string(GTK_PROGRESS(xsane.progress_bar), "");
   gtk_widget_show(GTK_WIDGET(xsane.progress_bar));
+  gtk_table_attach_defaults(GTK_TABLE(table), GTK_WIDGET(xsane.progress_bar), 0, 1, 1, 2);
 
 
-  /* vertical box for scan and cancel button */
-  vbox = gtk_vbox_new(FALSE, 3);
-  gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
-  gtk_widget_show(vbox);
-
   /* The Scan button */
   button = gtk_button_new_with_label(BUTTON_SCAN);
   xsane_back_gtk_set_tooltip(xsane.tooltips, button, DESC_SCAN_START);
   gtk_widget_add_accelerator(button, "clicked", xsane.accelerator_group, GDK_Return, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED);
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_scan_callback, NULL);
-  gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
   xsane.start_button = GTK_OBJECT(button);
+  gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 0, 1);
+
 
   /* The Cancel button */
 #ifdef HAVE_GTK2
@@ -5304,10 +5278,10 @@ static void xsane_device_dialog(void)
 #endif
   xsane_back_gtk_set_tooltip(xsane.tooltips, button, DESC_SCAN_CANCEL);
   gtk_widget_add_accelerator(button, "clicked", xsane.accelerator_group, GDK_Escape, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED);
-  gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
   gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE); 
   xsane.cancel_button = GTK_OBJECT(button);
+  gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 1, 2);
 
 
   /* create backend dependend options */
@@ -5415,7 +5389,7 @@ static int xsane_select_device_by_mouse_callback(GtkWidget * widget, GdkEventBut
 
 static void xsane_choose_device(void)
 {
- GtkWidget *main_vbox, *vbox, *hbox, *button, *device_frame, *device_vbox, *pixmapwidget, *label;
+ GtkWidget *main_vbox, *vbox, *hbox, *button_box, *button, *device_frame, *device_vbox, *pixmapwidget, *label;
  GdkBitmap *mask = NULL;
  GdkPixmap *pixmap = NULL;
  GtkStyle *style;
@@ -5462,13 +5436,13 @@ static void xsane_choose_device(void)
   device_selection_accelerator_group = gtk_accel_group_new(); /* do we have to delete it when dialog is closed ? */
   gtk_window_add_accel_group(GTK_WINDOW(xsane.choose_device_dialog), device_selection_accelerator_group); 
 
-  main_vbox = gtk_vbox_new(FALSE, 0);
-  gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 0);
+  main_vbox = gtk_vbox_new(FALSE, 12);
+  gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 12);
   gtk_container_add(GTK_CONTAINER(xsane.choose_device_dialog), main_vbox);
   gtk_widget_show(main_vbox);
 
-  vbox = gtk_vbox_new(FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER(vbox), 3);
+  vbox = gtk_vbox_new(FALSE, 0);
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
   gtk_box_pack_start(GTK_BOX(main_vbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show(vbox);
 
@@ -5481,7 +5455,7 @@ static void xsane_choose_device(void)
   xsane_back_gtk_make_path(sizeof(filename), filename, "xsane", 0, "xsane-logo", 0, ".xpm", XSANE_PATH_SYSTEM);
   pixmap = gdk_pixmap_create_from_xpm(xsane.choose_device_dialog->window, &mask, bg_trans, filename);
   pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask);
-  gtk_box_pack_start(GTK_BOX(vbox), pixmapwidget, FALSE, FALSE, 2);
+  gtk_box_pack_start(GTK_BOX(vbox), pixmapwidget, FALSE, FALSE, 0);
   gtk_widget_show(pixmapwidget);
   gdk_drawable_unref(pixmap);
 
@@ -5490,17 +5464,17 @@ static void xsane_choose_device(void)
   snprintf(buf, sizeof(buf), "%s %s\n", XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
   label = gtk_label_new(buf);
   gtk_widget_show(label);
-  gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 2);
+  gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
 
   /* list the drivers with radiobuttons */
   device_frame = gtk_frame_new(TEXT_AVAILABLE_DEVICES);
-  gtk_container_set_border_width(GTK_CONTAINER(device_frame), 4);
-  gtk_box_pack_start(GTK_BOX(vbox), device_frame, FALSE, FALSE, 2);
+  gtk_container_set_border_width(GTK_CONTAINER(device_frame), 0);
+  gtk_box_pack_start(GTK_BOX(vbox), device_frame, FALSE, FALSE, 0);
   gtk_widget_show(device_frame);
 
   device_vbox = gtk_vbox_new(FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER(device_vbox), 3);
+  gtk_container_set_border_width(GTK_CONTAINER(device_vbox), 6);
   gtk_container_add(GTK_CONTAINER(device_frame), device_vbox);
 
   owner = 0;
@@ -5574,13 +5548,17 @@ static void xsane_choose_device(void)
   }
   gtk_widget_show(device_vbox);
 
+
   /* The bottom row of buttons */
-  hbox = gtk_hbox_new(FALSE, 5);
-  xsane_separator_new(main_vbox, 5);
-  gtk_box_pack_end(GTK_BOX(main_vbox), hbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
+  hbox = gtk_hbox_new(FALSE, 0);
+  gtk_box_pack_end(GTK_BOX(main_vbox), hbox, FALSE, FALSE, 0);
+  gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
   gtk_widget_show(hbox);
 
+  button_box = gtk_hbox_new(TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox), button_box, FALSE, FALSE, 0);
+  gtk_widget_show(button_box);
+
   /* The Cancel button */
 #ifdef HAVE_GTK2
   button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
@@ -5589,7 +5567,7 @@ static void xsane_choose_device(void)
 #endif
   gtk_widget_add_accelerator(button, "clicked", device_selection_accelerator_group, GDK_Escape, 0, DEF_GTK_ACCEL_LOCKED);
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_exit, NULL);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(button_box), button, TRUE, TRUE, 6);
   gtk_widget_show(button);
 
   /* The OK button */
@@ -5600,7 +5578,7 @@ static void xsane_choose_device(void)
 #endif
   GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
   g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_choose_dialog_ok_callback, NULL);
-  gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(button_box), button, TRUE, TRUE, 0);
   gtk_widget_grab_default(button);
   gtk_widget_show(button);
 
@@ -5825,6 +5803,10 @@ static int xsane_init(int argc, char **argv)
       DBG(DBG_info, "user did not accept eula, we abort\n");
       return 1; /* User did not accept eula */
     }
+    else /* User did accept eula */
+    {
+      xsane_pref_save();
+    }
   }
 
   xsane_pref_restore_media();
@@ -5965,7 +5947,7 @@ static int xsane_init(int argc, char **argv)
 
 static void xsane_help_no_devices(void)
 {
- char buf[512];
+ char buf[1024];
 
   snprintf(buf, sizeof(buf), "%s\n\n%s", ERR_NO_DEVICES, HELP_NO_DEVICES);
   xsane_back_gtk_decision(WINDOW_NO_DEVICES, (gchar**) no_device_xpm, buf, BUTTON_CLOSE, NULL, TRUE);
diff --git a/src/xsane.h b/src/xsane.h
index 5cde44a..c5beb0e 100644
--- a/src/xsane.h
+++ b/src/xsane.h
@@ -91,7 +91,7 @@
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
 
-#define XSANE_VERSION		"0.994"
+#define XSANE_VERSION		"0.995"
 #define XSANE_AUTHOR		"Oliver Rauch"
 #define XSANE_COPYRIGHT		"Oliver Rauch"
 #define XSANE_DATE		"1998-2007"
@@ -103,6 +103,7 @@
 
 #define XSANE_DEBUG_ENVIRONMENT	"XSANE_DEBUG"
 
+#define XSANE_PROGRESS_BAR_MIN_DELTA_PERCENT 0.025
 #define XSANE_DEFAULT_UMASK		0007
 #define XSANE_HOLD_TIME			200
 #define XSANE_CONTINUOUS_HOLD_TIME	10
@@ -305,6 +306,12 @@
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
 
+#ifndef PATH_MAX
+# define PATH_MAX	1024
+#endif
+
+/* ---------------------------------------------------------------------------------------------------------------------- */
+
 enum
 {
   XSANE_PATH_LOCAL_SANE = 0,
@@ -497,12 +504,6 @@ extern void xsane_interface(int argc, char **argv);
 extern void xsane_batch_scan_add(void);
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
-
-#ifndef PATH_MAX
-# define PATH_MAX	1024
-#endif
-
-/* ---------------------------------------------------------------------------------------------------------------------- */
 #ifndef TEMP_PATH
 # define TEMP_PATH		/tmp/
 #endif
@@ -1040,7 +1041,7 @@ typedef struct XsaneSetup
   GtkWidget *preview_threshold_mul_entry;
   GtkWidget *preview_threshold_off_entry;
   GtkWidget *auto_enhance_gamma_button;
-  GtkWidget *preselect_scanarea_button;
+  GtkWidget *preselect_scan_area_button;
   GtkWidget *auto_correct_colors_button;
   GtkWidget *disable_gimp_preview_gamma_button;
   GtkWidget *preview_oversampling_entry;
diff --git a/xsane.CHANGES b/xsane.CHANGES
index b6cbd3b..577399d 100644
--- a/xsane.CHANGES
+++ b/xsane.CHANGES
@@ -2958,6 +2958,42 @@ xsane-0.993 -> 0.994:
 
  - xsane-scan.c: if (channels==1) then scanner_default_gray_icm_profile is used instead of scanner_default_color_icm_profile
 
- - xsane-scan.c: bugfix segfault when scanning: when scanner_default_color_icm_profile is not defined then "" is used instead
-   of scanner_default_color_icm_profile
+ - xsane-scan.c: bugfix segfault when scanning: when scanner_default_color_icm_profile is not defined then "" is used instead of scanner_default_color_icm_profile
 
+
+xsane-0.994 -> 0.995:
+---------------------
+
+ - changed layout of copy setup, removed border around all setup tabs
+
+ - changed layout of xsane main window
+
+ - xsane-front-gtk.c: xsane_browse_filename_callback: xsane.cms_function_option_menu is only updated when xsane.enable_color_management is active
+
+ - xsane-save.c: write_smtp_header(): it is allowed to specify multiple mail receivers in a comma separated list now
+
+ - xsane-save.c: write_smtp_header(): MAIL FROM and RCPT TO use syntax "<user@domain.org>" instead of "user@domain.org" now
+
+ - xsane-front-gtk.c: created xsane_progress_bar_set_fraction which uses the gtk2
+   functions when available and which only updates the progress_bar every 2.5 percent
+   what speeds up several functions - especially saving file routines -
+   
+   xsane*.c: replaced all gtk_progress_bar_update() by xsane_progress_bar_set_fraction()
+
+ - xsane-back-gtk.c: in function xsane_back_gtk_value_update()
+   replaced comparison for SANE_FIX values
+     if (new_val != val) 
+   by
+     if (abs(new_val - val) > 1)
+
+ - changed all "scanarea" to "scan_area" or "scan area"
+
+ - xsane-gtk-1_x-compat.h: changed gtk_progress_bar_set_ellipsize() to
+   gtk_progress_bar_set_ellipsize(pbar, mode)
+
+ - xsane_help_no_devices() changed buf size to 1024
+
+ - translations: U=updated, N=not updated, A=added/new
+   ca cs da de es fi fr hu it ja nl pa pl pt pt_BR ro ru sk sl sr sv tr vi zh zh_CN
+   U  N  U  N  N  A  N  N  U  N  N  U  N  N  N     N  N  U  N  U  N  N  N  N  N
+   99599 99599 96 99595 99 99595 99 99599 96 96    96 99 99599 99592 99 96 96 992
diff --git a/xsane.CHANGES~ b/xsane.CHANGES~
deleted file mode 100644
index cf0e645..0000000
--- a/xsane.CHANGES~
+++ /dev/null
@@ -1,2962 +0,0 @@
-CHANGES FOR FRONTEND XSANE FOR SANE:
-------------------------------------
-
-xsane-0.11 beta and before:
----------------------------
-
- - based on gtk-1.0.x
- - histogram
- - online color enhancement
- - gamma table: tested with
-   - 8, 10 and 12 input bits per color
-   - 8 output bits per color
- - standard and advanced options in own (non scrollable) window
- - photocopy function via postscript output (gray + color, not lineart)
- - frontend/Makefile.in changed for xsane
-
-
-xsane-0.11 -> 0.12:
--------------------
-
- - added ps, jpeg and png(1+8bit) output format, selected by filename
- - added lineart support for ps 
- - changed configure.in and config.h.in and included them into xsane
- - changed device selection dialog: scanner vendor and model added
- - added xsane-logo (winner from gimp-contest) to device-selection and about-window,
-   it is loaded from SANE_DATA_PATH/sane/xsane-logo.xpm (/usr/local/share/sane/...)
- - histogram window now always exists and may be hidden
- - changed handling of devicename given as commandline option:
-   sane_get_devices is called and the vendor, model and type get identified,
-   if the given device name does not fit to the beginning of an existing device name
-   the device selection is opened
-
-
-xsane-0.12 -> 0.13:
--------------------
-
- - file format detection now works with case insensetive
- - changed font for device selection
- - changed output format of device list for selection
- - disabled gamma table for 1 bit grayscale (lineart)
- - improved error handling of saving routines
- - removed ram eater in preview routine
- - added default gamma upload into preview scan routine
- - added tiff-output-format
- - changed lineart to grayscale conversion in saving-routines
- - added test if selected output format is supported before scan
-
-
-
-xsane-0.13 -> 0.14:
--------------------
-
- - added info window that displays hidden options/values
- - xsane compiles without sane-source-package now,
-   sane must be installed.
- - if scan is started with save for unsupported graphics format
-   an error message comes up before scanning is started
- - tested for param.depth>1 for gamma correction
- - added test for sane major version number, abort if mismatch
-
-
-xsane-0.14 -> 0.15:
--------------------
-
- - if device is given as commandline option it is now loaded again
-   if it is not in the devicelist
- - moved some functions in xsane.c out of a #ifdef HAVE_LIBGIMP .. #endif-block
- - added sliders in the gray/red/green/blue-levels for black/gray/white points
- - gamma correction in preview is now only done if depth > 1
- - enhancement sliders are not shown in lineart mode any more
-
-
-xsane-0.15 -> 0.16:
--------------------
-
- - moved save-routines to xsane-save, named xsane* to xsane-*
- - included progress-routines into xsane.c
- - moved xsane.h to xsane-text.h
- - moved definitions and external used function headers to xsane.h
- - added test for depth > 1 before calculating preview histogram
- - added test for preview_gamma_data_red before calculating preview histogram
- - added test for preview_gamma_data_red before doing preview gamma correction
- - added p->image_data_raw = malloc(3*p->image_width*p->image_height);
-   in xsane-preview.c/scan_start
- - added authorization_callback routine
- - renamed a lot of routines * -> xsane_*
- - added p->previous_selection.active = FALSE; draw_selection(p);
-   to preview_gamma_correction to redraw selection
- - added preview_update(p); to scan_done in xsane-preview.c to reactivate selection
- - added header for saving >8bpp raw data (SANE_GRAYSCALE_RAW, SANE_RGB_RAW)
- - added 16 bit saving routines for pnm(ascii), png and raw
- - added 16 bit routines to xsane_read_image_data, added 16 bit gamma software support
-
-
-xsane-0.16 -> 0.17:
--------------------
-
- - xsane-gtk.c moved free(elem->menu); elem->menu = 0; in panel_destroy out of
-   the for-loop
- - added some #ifdefs #endifs around saving routines for TIFF, PNG and JPEG
- - added BIT_DEPTH as well known option, preview sets this value to 8 if it is greater than 8
- - added range checks in calculation for auto enhancement values
- - calculation of auto enhancement values is not called in lineart mode any more
-
-
-xsane-0.17 -> 0.18:
--------------------
-
- - added quit_xsane in xsane_choose_dialog_ok_callback if no device was opened
- - added sane_get_parameters(..) in xsane_scan_dialog
- - added xsane_increase_counter_in_filename to xsane-save.[ch]
- - Filename counter is automatically increased after scan
- - Changed setup_dialog callbacks, cancel does work now
- - zoomfactor is calculated now if copy mode is selected
- - added tooltips for xsane setup options
- - changed "destroy"-event of authorization dialog to "delete_event"
- - in gsg_message made the ok button default
- - added gsg_decision routine
- - added overwrite warning
- - postscript images are saved in original size in scan mode now
-
-
-xsane-0.18 -> 0.19:
--------------------
-
- - added cancel callback routine for conversion/saving routines
- - printer_resolution now is set if OK is pressed in setup
- - overwrite warning is not shown in copy mode any more
- - changed fclose to pclose for closing pipe to printer command
- - restored xsane.resolution in xsane_pref_device_restore
- - added Help menu, called Netscape -remote to open help-files
- - set sensetivity of xsane dialog and histogram dialog while
-   scan and preview scan to false
- - added some help(html) files to the doc directory
-
-
-xsane-0.19 -> 0.20:
--------------------
-
- - improved online help
- - added own version number for xsane, there are three version
-   numbers now:
-   - xsane version
-   - sane version
-   - package version (e.g if there is a package of different frontends)
- - added gamma value (gray, red, green, blue) for printer (copy mode)
- - changed sane-style.rc -> xsane.style.rc
- - changed PATH_SANE_DATA_DIR -> old PATH_SANE_DATA_DIR/sane
- - preview gamma correction is done by the xsane gamma correction instead of
-   the Xserver gamma correction, there are also values for red, green and blue
-   now.
- - spilt setup window into notebook pages
- - replaced in xsane_pref_set_unit_callback preview_update by preview_area_resize,
-   the ruler units are updated now if unit is changed
- - made menue length unit inactive if length unit is pixel
- - added dialogs for batch scan list and fax page list, but not finished and disabled
- - changed local includes from <...> to "..."
- - test for filetype is only done in scanmode now
- - added list of (up to 10) printers for photocopy mode 
- - added error messages if failed to open files
- - added sigpipe_handler for handling broken pipe while writing to printercommand
-
-
-xsane-0.20 -> 0.21:
--------------------
-
- - in xsane-preview.c if backend does not use scanareaselection dev_selection[i]
-   is set to width/height of image
- - replaced most sprintf by snprintf
- - made menue length unit inactive if scanare is nut supported by the backend
- - set maximum value in 16 bit saving routines to 16 bit/65535
- - 1 bit/pixel png file is saved with 1 bit/pixel instead of 8 bit/pixel now
- - added support for gtk-1.2
- - font are set in xsane-style.rc now
-
-
-xsane-0.21 -> 0.22:
--------------------
-
- - split xsane.c in:
-   - xsane.c
-   - xsane-setup.c
-   - xsane-gamma.c
-   - xsane-front-gtk.c
-   - xsane-scan.c
- - renamed xsane-gtk.c to xsane-back-gtk.c
- - removed libtool from package
- - added experimental fax support
-
-xsane-0.22 -> 0.23:
--------------------
-
- - changed configure.in, removed some unnecessary parts
-   and added error messages if gtk or sane is not installed
-
- - removed copy-mode resolution bug (was not changed if zoom slider was moved)
- - removed bug in faxmode if faxproject did not exist (fclose(0))
- - changed definition of struct xsane and struct xsane_setup
- - added documentation-viewer-command to setup, netscaperemote is selected
-   via the keyword "netscape-remote"
-
-xsane-0.23 -> 0.24:
--------------------
-
- - removed some bugs in gamma value calculation for real scan (preview was ok)
- - added activation for some windows after scan error
- - removed bugs in startup if no device is available or selected,
-   the xsane.rc-file keeps untouched now
-
-
-xsane-0.24 -> 0.25:
--------------------
-
- - moved xsane_pixmap_new as xsane_create_histogram from xsane-front-gtk.c to
-   xsane-gamma.c
- - now putting the histogram sliders directly into the slider preview instead
-   of drawing into the preview window, the sliders are not erased by other
-   other windows now
- - added block_update_param flag, the update_param and update_histogram routines
-   are now called only one time if the preview scan area is changed
- - added changing of one edge in preview scanarea (left mousebotton near the edge)
- - added moving of preview scanarea (middle or right mousebutton)
- - moved creation of histogram dialog to xsane-gamma.c
- - removed some bugs in the preview, resizing the preview window should work now
- - added an experimental zoom for the preview
-
-
-xsane-0.25 -> 0.26:
--------------------
-
- - removed some preview_update calls or replaced them by preview_update_selection
- - renamed preview_update to preview_update_surface and made surface_changed a parameter
- - ruler scaling is now ok in resized windows and zoomed previews
- - added some range checks in preview_calculate_histogram
- - parts in the preview window that are not part of the scan area are painted gray now
- - added image_surface to preview structure, it stands for the surface of the scanned preview image
- - renamed preview_get_image_scale to preview_get_scale_preview_to_image
- - added routine preview_get_scale_device_to_preview
- - added Zoom 20% out routine
- - the selected area can be larger than the viewable preview now
- - added Pipette functions (pick black, gray and white) - mouse pointer does change to pipetty icon
- - p->aspect is calculated by image-size now if the surface is not defined (INF) in
-   preview_update_surface
- - preview_update_surface is called now after preview scan and preview_restore_image
- - moved the "Help" menu in the main dialog to the right
-
-
-xsane-0.26 -> 0.27:
--------------------
-
- - added scantips and index of backends to help menu
- - changed configure.in, libpng should be found on (all ?) systems now
- - black and white point sliders use the two additional pixels now
- - user can preset (reduce) the preview area now
- - added "Select visible area" button
- - removed some bugs in gray gamma value calculation for real scan (preview was ok)
- - setup of faxoptions: normal, fine and postscript option is saved now
-
-
-xsane-0.27 -> 0.28:
--------------------
-
- - added option negative into enhancement and changed create_gamma
-   draw_histogram and auto_enhancement to work with it!
-
- - increased contrast range from -100..+100 to -100..+200
-   and brightness range from -100..+100 to -200..+200
-   because the old values were not sufficent for scanning negatives
-
- - added selection for number of copies in copy mode
-
-
-xsane-0.28 -> 0.29:
--------------------
-
- - removed bug in xsane_set_resolution that could cause a segmentation fault
- - added support for resolution of type CONSTRAINT_WORD_LIST 
- - xsane-mode (scan, copy, fax) can be selected as command line option (-s, -c, -f) now
- - most texts that are defined in xsane are defined in xsane-text now
-
-
-xsane-0.29 -> 0.30:
--------------------
-
- - removed bug in xsane_set_resolution, now highest resolution can be set if
-   resolution is a list!
- - added RGBI support - must be activated in xsane.h (SUPPORT_RGBI)
- - added options rgb default and negative to preferences
- - enhancement values are saved with device settings now
- - The filename can be specified now for the file in which the device settings are saved
-   or from which they are loaded.
-   - changed extension from ".rc" to ".drc" (device rc)
-   - added header "XSANE_DEVICE_RC" to identify it as device-rc-file
- - added calculation for color components to auto enhancement
- - pipette functions: middle mouse button defines shadow/gray/highlight
-   for color components, left mouse button only defines gray values!
- - auto enhancement values are set to standard values in
-   xsane_calculate_histogram if no values could be calculated
- - histogram is cleared when sensitivity is set to false
- - improved calculation of auto enhancement values
- - increased contrast range from -100..+200 to -100..+300 (gray) and
-   -300..+300 (color) and brightness range from -200..+200 to -300..+300
-
-
-xsane-0.30 -> 0.31:
--------------------
-
- - changed filename character transformation: erase " ", "_" -> "__", "/" -> "_"
- - device settings standard file name is vendor:model
-   so it does not matter any more if the sg-device name has changed
- - the xsane main window can be a fixed or a scrolled, resizable window now.
-   selection is done with setup/display/"main window fixed",
-   the main window mode can be overwritten by specifying a command
-   line option:
-   -R or --Resizeable activates the resizeable, scrolled window,
-   -F or --Fixed activates the fixed (non resizable) window (default)
- - histogram is cleared when info dialog or about dialog is opened
- - changed version option from -V to -v
- - added support for Automatic Document Feeder (scan until error)
-   this is experimentary because in the SANE-standard there is
-   no way defined how a frontend can identify an ADF.
-   The backend has to load the next document automatically!
- - in xsane_enhancement_update replaced gtk_signal_emit_by_name
-   by gtk_signal_emit
- - moved more texts to xsane-text.h
- - changed all RGBI -> RGBA because the 4th channel is ALPHA
-   I think that SANE_FRAME_RGBA will be added to the sane standard
- - gtk+-1.2.0 is minimum requirement: removed tests for
-   gtk_tooltips_set_tips, gtk_scrolled_window_add_with_viewport
-   and gtk_events_pending that were needed for gtk+-1.0.x
- - added option "--device-settings file" to define default
-   filename for device-settings
- - corrected "legal" size in preview
- - added device_text to info and preview window title
- - moved color definition to xsane_creat_histogram_dialog
- - pixmap colors depend on histogram_dialog now because
-   the histogram dialog is the first dialog that exists
- - renamed all gtk functions like defined in gtkcompat.h
-   (gtk+-1.0.x -> gtk+-1.2.x)
- - removed bug in device selection, device can be selected
-   now with keyboard
- - xsane info window prints gamma depth "none" in 1 bit modes
-
-
-xsane-0.31 -> 0.32:
--------------------
-
- - added option --no-mode-selection/-s to disable menu for
-   xsane mode selection
- - prepared text outputs (in xsane-text.h) for NLS/gettext support
- - multiple \n in scanf while reading saved preview image removed
- - added AM_PROG_CC_STDC to configure.in for HP/UX
- - added a break statement after each default in switch block
- - changed test for multiple image scan, when sane_read returned with
-   SANE_STATUS_GOOD when the image is finished we start a new scan,
-   SANE_STATUS_EOF is expected when scanning should be stopped.
-   This way the Automatic Document Feeder is supported a way
-   like planned in the sane standard, the backend says
-   if the frontend shall call sane_start repeatadly.
-
-
-xsane-0.32 -> 0.33:
--------------------
-
- - removed change about SANE_STATUS_GOOD in multiple image mode.
-   Adf mode is detected by scanmode again. This would be better
-   selected by a mulit_image bit in the preferences block.
- - added common rotuine xsane_set_sensitivity to xsane-front-gtk.c
- - renamed xsane_test_adf to xsane_test_multi_scan
-
-
-xsane-0.33 -> 0.34:
--------------------
-
- - the preview selection is based on device coordinates instead of
-   preview window coordinates now
- - added preview buttons and preview viewport to xsane_set_sensitivity
- - info and about dialog use xsane_set_sensitivity now
- - dummy_filename is created and opened for writing AFTER sane_start is called.
- - sane_start() == NO_DOCS is not handled as error any more
- - xsane_scan_done -> sane_cancel is called now if an error occurs
- - if an error occurs while scanning the created file is removed
- - xsane windows/buttons get inactive while setup dialog is open
- - xsane_scan_done -> sane_cancel is called when main window is closed
-   (while scanning)
- - if there are no standard device settings at program startup, xsane
-   take the backend predefined resolution (before this was set to 100)
- - if no scanarea options are given, the preview works with
-   [0,INF] instead of [-INF,INF] now
- - transformed all gif files in directory doc to jpeg format because of
-   all the trouble about the gif licence.  Will never use gif again!
-
-
-xsane-0.34 -> 0.35:
--------------------
-
- - corrected doc/Makefile.in for change gif->jpg
- - added tiff compression type selection for multi bit and one bit images to
-   setup:
-   none, CCITT 1D Huffman compression, CCITT Group 3 Fax compression,
-   CCITT Group 4 Fax compression, Lempel-Ziv & Welch, JPEG DCT compression,
-   pack bits
- - implemented real single-bit format for tiff
- - setup/jpeg quality selection is enabled if jpeglib or libtiff is available
- - added gimp_image_set_resolution(...) to gimp saving routine
- - added test for libgimp/gimpfeatures.h to configure.in and config.h.in
- - disabled sensetivity while filename browse window is open
- - added handling if fileselection window was closed
- - moved filename "Browse" button from the right to to the left with disk-image inside
- - (added image filetype menu to the image filename line - not ready)
- - replaced button-texts negative, rgb default, auto, default, store and
-   restore by icons
-
-
-xsane-0.35 -> 0.36:
--------------------
-
- - moved xsane_generate_dummy_filename in xsane-scan.c out of a
-   #ifdef HAVE_LIBGIMP_H block
- - changed some icons
- - added #ifdef HAVE_LIBTIFF around TIFF-relevant definitions in
-   xsane_setup_dialog in xsane-setup.c
- - included NLS/gettext version 0.10.35
- - texts that are created by xsane can be converted to other languages
-   now - texts created by the backend can not be translated yet!
- - added gettext relevant routines to aclocal.m4 and correct some bugs
- - added french translation - thanks to Vincent Renardias <vincent@ldsol.com>
- - added german translation table
- - translation files "*.po" are created by "*.po.in" with help of the
-   preprocessor of gcc, all texts are #defined in frontend/xsane-text.h
-
-
-xsane-0.36 -> 0.37:
--------------------
-
- - added some texts to xsane-text.h and newlanguage.po.in[.in],
-   created file add-0.37.po.in where the new entries are listed
- - moved generation of xsane.backend (backendname like umax)
-   from xsane_help_build_menu to xsane_device_dialog, needed for
-   translation of backend options
- - added translation for backend options:
-   Backend translation is done with translation table sane-BACKENDNAME.mo 
- - removed bug in preview_update_selection()
-   (forgotten p->selection.active = TRUE)
-   The selection box is updated correct now
- - removed bug in aclocal.m4: not fount "-lintl" when gettext is in glibc
-
-
-xsane-0.37 -> 0.38:
--------------------
-
- - changed STANDALONE -> XSANE_STANDALONE and
-   GIMP_EXTENSION ->  XSANE_GIMP_EXTENSION because GIMP_EXTENSION
-   now (gimp-1.1.10) is used in the Gimp
- - changed brightness and contrast range maximum form 300 to 400 %
- - moved gimp installation texts to xsane-text.h
-   added entries to po/newlamguage*
- - xsane -g now does not print anything and does not abort if gimp
-   support is compiled in
- - changed lib/Makefile.in and sanei/Makefile in, make install should
-   work without a previous make now
- - xsane gimp-plugin is selected via file/acquire now when
-   gimp-version >= 1.1.9
- - . removed ../intl/libintl.a form frontend/Makefile.in and
-   . added CATOBJEXT=UNKNOWN and XGETTEXT=":" in if "gettext is in libc"
-     to aclocal.m4
-   hope this solves problems with missing "-lintl" now on all systems
- - moved "show xxx" menu items form menu "Preferences" to menu "View"
- - added continuous update to histogram sliders and preview selection
- - added preferences menu item "Update policy"
- - now options are only changable if SANE_CAP_SOFT_SELECT is set
- - added test for bitdepth in xsane_scan_dialog for GIMP mode,
-   error message pops up when unsupported bit depths are selected
- - moved case XSANE_PNM16 out of a #ifdef HAVE_LIBPNG block
- - position of all windows and size of main window and preview window
-   is save in device settings, setting preview window geometry
-   does not work because window does not exist at relevant times.
-
-
-xsane-0.38 -> 0.39:
--------------------
-
- - bounded contrast to >=-100.0
- - Added test if GIMP_CHECK_VERSION is defined
-
-
-xsane-0.39 -> 0.40:
--------------------
-
- - device name is saved in drc file now
- - xsane version is saved in drc file now
- - warning is printed if device rc file was not created for active device
- - removed member device from struct preferences - was never used
- - changed frontend/Makefile.in (XSCAN->BINPROGS)
- - changed configure.in:
-   - changed order of some checks
-   - added status messages at the end
-   - added "--enable-intl-patch" which adds -lintl to check for libsane
-   - added "--disable-gimp"
-   - added "--disable-jpeg"
-   - added "--disable-tiff"
-   - added "--disable-png"
- - moved xsane_generate_dummy_filename and fopen() into if XSANE_STANDALONE block,
-   there is no empty file created in gimp mode any more.
-
-
-xsane-0.40 -> 0.41:
--------------------
-
- - renamed xsane-incons.h -> xsane-icons.c and xsane-icons-def.h -> xsane-icons.h
- - moved all includes that are needed by most xsane sources to xsane.h
-   problem with missing stdio.h is solved that way
- - changed configure script:
-   - check for sane is moved to the end because of missing libintl,
-   - check for png is done with x_includes and x_libraries,
-     and libpng is added to lib after all checks are done
-
-
-xsane-0.41 -> 0.42:
--------------------
-
- - changed configure.in, error message about missing sane is also printed if sane.h
-   is not found.
- - changed info row (size box, start button): the start button is made smaller when
-   the info box needs more place
- - changed calculateion of size in info row from unisgned long to float
-   because unsigned long / 10 were to small to fit A4 with 1200x1200 dpi
- - changed png part of configure, HAVE_LIBPNG is now defined again
- - corrected png lineart saving
-
-
-xsane-0.42 -> 0.43:
--------------------
-
- - disabled LZW-compression for TIFF.
-   Unisys holds a patent for LZW compression. I am not sure
-   about the licence status of LZW and TIFF. GIF is not supported
-   because of the licence problem. LZW for TIFF is disabled now.
- - removed all LZW entries in sourcecode and translation tables
-
-
-xsane-0.43 -> 0.44:
--------------------
-
- - renamed NOTEBOOK_PRINTER_OPTIONS to NOTEBOOK_COPY_OPTIONS
- - added sane-problems-doc.html to the help menu
- - added functions around "by ext" menu
- - all functions in xsane-back-gtk.c are named with xsane_back_gtk_* now
-
-
-xsane-0.44 -> 0.45:
--------------------
-
- - added *s = 0; in sanei_codec_ascii.c when reading a string that
-   does not start with '"'
-
- - added test "if (!w.status)" when reading a string in sanei_load_values.c
-   the missing test caused a segfault when a string was expected but
-   the line did not start with '"'
-
- - merged together all needed sanei_* routines in xsane-rc-io.c
-   and renamed all sanei_* to xsane_rc_io_*, removed subdir sanei
-   and changed xsane.c and xsane-preferences.c to use xsane-rc-io.[ch]
-   and reprogrammed some things.
-
- - renamed all xsane_pref_device_* to xsane_device_preferences_*
-   and moved them to xsane-device-preferences.c
-
- - renamed sanei_w_[load|save]_values to xsane_device_preferencs_[load|save]_values
-   and moved them to xsane-device-preferences.c
-
-
-xsane-0.45 -> 0.46:
--------------------
-
- - changed xsane_rc_io_w_space: returns ENODATA instead of EINVAL at EOF
-
- - added xsane_rc_io_w_skip_newline
-
- - changed xsane_device_preferences_load_values:
-   - begin at start of file is only inciated if w.status == ENODATA 
-   - if w.status is an other error, the line is skipped
-
- - moved and renamed w_string, w_int, w_double from xsane-preferences.c
-   to xsane_rc_pref_* in xsane-rc-io.c
-
- - repleaced fprintf/fscanf for reading xsane device preferences by
-   xsane_rc_io_w_* routines
-   This way the floating point values (xsane- gamma, brightness and contrast)
-   are saved different and the *.drc-files are incompatible in that point.
-
- - added test for lineart mode (depth == 1) in xsane_enhancement_update
-   solves segmentation fault problem when device settings with lineart enabled
-   are loaded
- 
-
-xsane-0.46 -> 0.47:
--------------------
-
- - if helpfile viewer is netscape-remote and netscape is not running
-   it is started
-
- - replaced ENODATA (used for EOF detection in xsane-rc-io and
-   xsane-device-preferences) by XSANE_EOF (=-1)
-   (ENODATA is not defined on all systems)
-
- - If faxproject does not exist, project data entries are made insensitive
-   and buttons "send project" and "delete project" are replaced by "create project"
-
- - Added missing "&" in xsane_device_preferences_save_values:
-   xsane_rc_io_w_array(w, &len, (void **) &word_array, (WireCodecFunc) xsane_rc_io_w_word, sizeof(SANE_Word));
-   that cause segmentation fault when writing bool, int or fixpoint arrays.
- 
-
-xsane-0.47 -> 0.48:
--------------------
-
- - "START" button is made insensitive in fax mode if project does not exist.
-
- - Preview window is created at the same time as the main dialog and it is destroyed
-   at program end. Disabling "show preview" hides the preview window. This way the preview
-   window placement does work correct.
-
- - set default values in xsane_device_preferences_load_file(char *filename)
-   before reading the saved values, show_preview default = true
-
- - Mouse pointers display relevant mode icons in preview window now.
-
- - In copy mode the maximum selectable size that fits to the selected printer is drawn
-   by a rect now. Selection is limited to the printer size.
-
- - if no local xsane.rc, xsane-style.rc or DEVICE.drc file exists it is loaded from SANE_DATA_DIR/xsane
-
- - all xsane rc files are placed in a subdirectory xsane now (~/.sane/xsane, SANE_DATA/DIR/xsane)
-
- - temporary files (previews, conversions) are saved in /tmp (defined in SANE_PATH_TMP in xsane.h) now
-
- - added window decoration icon (top left) to each xsane window (does work with kwm, does not work with fvwm2)
-
- - added warning icon and error icon
-
- - removed xsane_files_exit_callback, now xsane_scan_win_delete is used for all exit program calls
-
- - conversion-* and preview-* files are created with permission "-rw-------",
-   images- and project-files are created with "preferences.image_umask"
-   xsane.rc and *.drc are created with XSANE_DEFAULT_UMASK defined in xsane.h
-
- - added file permission selection in preferences/saving options for image file and for directory (faxproject)
-
- - disabled fileoptions (mkdir, rm, mv) in loading/saving preferences
-
-
-xsane-0.48 -> 0.49:
--------------------
-
- - added support for different x/y resolutions and zoom factors,
-   the y-resolution slider is added to the xsane main dialog now
-
- - in gimp mode x- and y-resolution infos are set correct now
-
- - added resolution and zoom icons for x- and y-dimension
-
- - added fax_width and fax_height to preferences
-
- - added paper size frame in fax mode preview
-
- - added czech translation - thanks to by Stanislav Brabec <utx@k332.feld.cvut.cz>
-
- - changed gimp_install_procedure(...): "RGB, GRAY" -> 0
-
- - changed printer geometry setup from 1/72 ich to mm
-
- - added setup entries for fax- width, height, left_offset and bottom_offset
-
- - corrected terminating \0 of strings in sane_choose_device
-
- - when button "Negative" is pressed the white/gray/black points
-   are also inverted
-
- - split preview_restore_image into preview_restore_image and
-   preview_restore_image_from_file, it can zoom into a saved
-   image now.
-
- - zoom functions are done now without a new preview scan.
-   3 different zoom levels are stored.
-
- - in xsane_scan_start the output file is only opend once in multi pass scan
-   three pass scan does work now again.
-
- - added several missing routines for gamma correction in three pass scan
-
-
-xsane-0.49 -> 0.50:
--------------------
-
- - removed bug in calculation of paper size in copy and fax mode
-
- - added support for rotate image in xsane_save_ps
-
- - added support for rotate (landscape mode) in copy mode and save-ps mode
-   and added preferences menu "Rotate Postscript"
-
- - added bugfix for gtk_tooltips_set_colors as long as it does not work in gtk
-
- - improved memory allocation routines and error handling in preview
-
- - after the main window is created the resolution, resolution_x amd resolution_y
-   are made up to date now
-
- - changed dynamic menue list definition in xsane_setup for TIFF_COMPRESSION menu
-
-
-xsane-0.50 -> 0.51:
--------------------
-
- - added some rangechecks to histogram->gamma calculation
-   it is done as histogram->gamma->histogram now
-
- - changed redraw frame in preview_display_partial_image(),
-   now the old image is completely overpainted! 
-
- - added xsane_set_all_resolutions() to xsane_printer_callback,
-   now paper size frame is updated when printer is changed
-
- - corrected wrong error message in setting of scansource_selection
-   from "unknown type" to "unknown constraint type"
-
- - moved xsane.header_size = 0; to the end of xsane_scan_done so it is called in each case
-   the missing command was responsible for a segfault when starting a scan after xsane_cancel
-   has been called
-
- - moved progress_bar from it's own window to the bottom of the main window
-   progress_bar texts are displayed in info frame and in progress bar
-
- - added size in mm/cm/in to progress bar when not scanning
-
- - in scales the number of digits is defined by quantization now, if no quantization is given
-   by backend (quant=0, SANE_TYPE_FIXED) x.2 digits are displayed
-
- - corrected page_step for scales
-
- - selection_active is reset in preview_display_partial_image instead of preview_paint_image
-
- - updated czech translation file cs.po.in - thanks to Stansislav Brabec
-
-
-xsane-0.51 -> 0.52:
--------------------
-
- - changed gimp_install_procedure(...) for specified device: "RGB, GRAY" -> 0
-
- - in xsane-scan.c and xsane-preview.c added " | GDK_INPUT_EXCEPTION" to
-   gdk_input_add(fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION, preview_read_image_data, p);
-
- - added static int xsane_set_modus_defaults(void)
-   zoomfactor is set to 1.0 if copy mode is selected
-   full preview area is selected if copy or fax mode is selected
-
- - removed a second xsane_device_preferences_restore(); in static void xsane_device_dialog(void)
-
- - zoom factor keeps unchanged when printer is changed
-
- - added psfile-geometry to setup/saving options, it is used when saving postscript in scanmode
-
- - moved exisiting routines to open functions to xsane-front-gtk.c:
-   void xsane_define_output_filename(void);
-   void xsane_identify_output_format(char **ext);
-
- - define_maximum_output_size is called in each routine that changes filename or fileextension
-   because the output frame is also drawn in scanmode with filetype postscript now
-
- - included Stanislav Brabec's <utx@penguin.cz> sed-scripts and changes for Makefile.in in xsane-*/po
-
- - added creation of newlanguage.po in po/Makefile.in
-
- - updated german translation file de.po
-
- - updated czech translation file cs.po - thanks to Stanislav Brabec <utx@k332.feld.cvut.cz>
-
- - updated french translation file fr.po
-
-
-xsane-0.52 -> 0.53:
--------------------
-
- - added test if vendor, model and type strings do exists (pointer != 0)
-   otherwise "no vendor",... is printed
-
- - changed
-     ext = &extension;
-   to
-     if (extension)
-     {
-       *ext = strdup(extension);
-     }
-     else
-     {
-       *ext = 0;
-     }
-   in xsane_identify_output_format - bad thing, I get old ;-)
-
- - added new routine xsane_find_best_resolution that makes sure that the selected resolution
-   fits into range/quantization given by backend.
-   This is used by xsane_set_resolution and when resolution_list is created.
-
- - added xsane_set_all_resolutions to xsane_set_modus_defaults
-
- - xsane resolution can be changed by backend now
-
-
-xsane-0.53 -> 0.54:
--------------------
-
- - updated french translation table
-
- - updated german translation table
-
- - changed type of umask in preferences from mode_t to int because
-   sizeof(mode_t) is on some machines only 2 bytes what cause problems.
-   all calls of umask(foo) are changed to umask((mode_t) foo)
-
- - changed preferences update_policy from GtkUpdateType to int.
-
- - selection box can not be moved out of the preview window, the
-   size of the selection keeps unchanged in that case now.
-
- - removed some gtk_main_iteration and reordered some selection drawing routines.
-
- - removed unused files/directories from package:
-   sanei, include/sane/sanei_(some).h, po_old
-
-
-xsane-0.54 -> 0.55:
--------------------
-
- - added preview support for 16 bpp (transformed to 8bpp)
-
- - added copyright line in devcie selection dialog
-
- - preview selection frame is only active when backend supports coordinate selection
-
- - added preview oversampling factor (multiplier for calculated preview resolution)
-
- - added lineart enhancement: preview can be done in grayscale now,
-   threshold value change is displayed without a new preview scan.
-
- - added "device options" to setup dialog:
-   - Scanner dependant options for grayscale->lineart conversion have
-     to be entered there.
-
- - a color preview is now displayed gray when grayscale mode is selected
-
- - updated de.po, cs.po, fr.po
-
- - updated po/xsane-pot.sed
-
-
-xsane-0.55 -> 0.56:
--------------------
-
- - added hold timer to preview (update-policy=delayed)
-
- - added hold timer to xsane_slider (update-policy=delayed)
-
- - moved help menu from file to help
-
- - added swedish (sv) translation - thanks to Johan Bengtsson <johanb@lls.se>
-
- - removed bug in xsane_rc_io_w_string, it returns EINVAL now each time when the string
-   does not begin with "
-
-
-xsane-0.56 -> 0.57:
--------------------
-
- - made xsane_choose_device return type to void (was gint32)
-
- - arranged device-preferences in struct xsane in the order they are used
-   as device preferences, made sure that all variable types are correct:
-   - changed type of xsane.mode from gint32 to int
-   - changed type of xsane.lineart_mode from gint32 to int
-   - changed type of xsane.show_preview from SANE_Bool to int
-   - changed type of xsane.enhancement_rgb_default from SANE_Bool to int
-   - changed type of xsane.fax_finemode from SANE_Bool to int
-
- - added mask for *_lock in preview motion_notify_event handling
-   Preview selection can be done with locks activated now
-
- - histogram is cleared before/redrawn after saving/loading device settings
-
- - added xsane_control_option() that tests if option >= 0 and returns SANE_STATUS_INVAL if not
-
- - added xsane_get_option_descriptor() that tests if option >= 0 and returns NULL if not
-
- - changed parameters of preview_area_resize and added preview_area_resize_handler
-
- - removed a lot of gtk_main_iterations from xsane_preview.c
-   they make problems in the redrawing order and can cause display problems
-
-
-xsane-0.57 -> 0.58:
--------------------
-
- - split the preview_event_handler into
-   - preview_press_button_event_handler
-   - preview_motion_event_handler
-   - preview_release_button_event_handler
-
- - the preview_expose_event_handler now is called twice,
-   the second call has been placed in the preview_event_handler_before
-
- - reactivated gtk_main_iteration after at the end of motion_event
-
- - added warning window when xsane is started as root
-
- - added selection of temporary directory in preferences/setup/saving options
-
- - added gdk_input_remove(xsane.input_tag); before xsane_start_scan is called
-   in 3-pass scanning mode (suggestion from Heiko_Schroeder@t-online.de)
-
- - changed output of "xsane -v"
-
- - in xsane_scan_done moved xsane.header_size = 0; before test for ADF
-   Thanks to Russell Coggrave for the info about it.
-
- - added gtk_set_locale() before gtk_init()
-
- - added copyright sign "(c)" to translated texts because it is not available on all charsets
-
- - temporary filenames are created random and unique (mktemp + random number)
-   due to security problems with fixed/calculateable tempfiles.
-
- - the preview-files are created (empty) at program startup now
-
- - when program exits the previews are erased
-   there is no way to store the preview images any more when the program is closed
-
- - preview_restore_image() creates the xsane-startimage if no preview is stored
-
- - renamed directory frontend to src
-
- - create xsane-help script that opens online helpfile
-
-
-xsane-0.58 -> 0.59:
--------------------
-
- - preview_do_gamma_correction does test for 3 pass scanner color mode
-
- - changed fax x-resolution and standard resolution from 98 ppi to 204 ppi
-   and with of faxpage from 210.0 to 215.7 (so we get 1728 pixels in x direction,
-   hxlafax-faq says that is the correct size)
-
- - split preferences.printer[..].resolution -> lineart, grayscale and color_resolution
-
- - added setlocale(LC_NUMERIC, "C"); in xsane_init() and #include <locale.h> in xsane.h
-   this should solve the problems with empty images (100%transparent) with gimp
-   and other problems that were caused by local settings (1.3 <=> 1,3).
-
- - added setup-option "disable gimp preview gamma"
- 
- - added selection (preferences/setup/enhancement options) if autoenhancement changes gamma value
-
- - renamed Preferences/Setup/"Device options" to "Enhancement options"
-
- - removed xsane internal callbacks from dialog struct, the functions are called directly now
-
- - changed the reading of the preview image header. The last newline character before the image
-   data starts again made some problems, this seems to depend on the data that follows. So I added
-   a fgets() command to skip the newline character - this seems to work.
-
- - changed increase_filename_in_counter, does work now if the only character of the base-filename
-   is the counter
-
- - reduced size of src/xsane-startimage.pnm (1MB => 0.6MB)
-
-
-xsane-0.59 -> 0.60:
--------------------
-
- - after filename counter is increased the cursor in the outputfilename entry is moved to the right
-
- - in preview_read_image_data when image is complete:
-    preview_update_surface(p, 0);
-   is called before
-    preview_display_image(p);
-   this way the geometry of the first preview scan is correct.
-
- - moved xsane_set_all_resolutions in xsane_update_xsane_callback(),
-   it now also is called when the backend only uses one reesolution
-
- - added calibration image (xsane-calibration.pnm) that is loaded when setup window is created.
-   The xsane enhancement functions are disabled in calibration mode, the image can not be
-   resized (xscale = yscale = 1.0).
-   The previsous image is reloaded when the setup window is closed again.
-
- - enviornment variable SANE_DEFAULT_DEVICE is used to activate the radiobutton in the
-   device selection menu
-
- - removed unused item "custom" from preview surface menu
-
- - changed preview surface menu items:
-   A3  -> A3P (portrait)
-   A4  -> A4P (portrait)
-   A4H -> A4L (landscape)
-   A5  -> A5P (portrait)
-   A5H -> A5L (landscape)
-
- - removed script xsane-help, necessary command now is listed in xsane.PROBLEMS
-
-
-xsane-0.60 -> 0.61:
--------------------
-
- - added debug output function and messages (environment variable XSANE_DEBUG)
-
- - moved all global variables and struct GSGdialog to global struct xsane
-
- - cleaned up some variable names
-
- - added free gamma curve dialog (not ready)
-
- - prepared xsane for win32:
-   - when BUGGY_GDK_INPUT_EXCEPTION is defined only blocking mode is used
-     (needed because GDK input exception does not work on win32)
-   - on win32 you cannot get a homedirectory, for this
-     XSANE_FIXED_HOME_PATH has to be set to the path that shall be
-     used as homedirectory
-   - replaced all gtk_dialog_new by gtk_window_new and added hbox and vbox to the window
-     (gtk_dialog_new does not work on WIN32)
-   - added xsane.WIN32 and xsane.WIN32-compilation that describes how xsane
-     is build on WIN32 with CYGWIN
-   - replaced "/" in all paths, added label SLASH that is predefined to '/' if it is
-     not defined by compiler option. For WIN32 it is set to '\' by compiler option
-   - all fopen functions use argument "rb" or "wb" now (b=binary). This is needed for WIN32
-     and the b is ignored on unix systems.
-   - published binary version xsane-win32-0v01 and xsane-win32-0v02 based on
-     xsane-pre0.61 versions
-
- - removed an ugly bug: in struct Preferences there was predefined a string ("/tmp/")
-   that caused a bad memory state when the string memory was freed,
-   instead the string is defined in xsane_pref_restore now
-
- - changes for tiff format:
-   - added support for 16 bit tiff format.
-   - predefined tiff-compression is changed from 5 to PACKBITS(16bit), JPEG(8bit), FAXG3(1bit).
-   - add resoultion-tags and datetime-tag to tiff files.
-
- - added "change directory" entry to preferences menu
-
- - added "scanning for devices" dialog
-
-
-xsane-0.61 -> 0.62:
--------------------
-
- - updated manpage (was about 1 year old)
-
- - removed sigprocmask.c from xsane-*/lib (not used)
-
- - added icons (32x32 and 48x48) for unix(xpm) and Windows(ico)
-
- - some additional changes for rotating preview
-
- - removed bug in preview_get_color that caused segfault when
-   click with pipette was placed into preview area but outside the image,
-   ( there was no test for image size )
-
- - in info dialog tiff is now listed as supported 16 bit format
-
- - filename counter is increased now if path or filename includes a "."
-   and fileytpe is seleced by menu
-
- - added possibility to move the edge of the preview selection frame
-   thanks to Laurent Martelli for his suggestion for that
-
- - added sane_get_parameters(xsane.dev, &xsane.param) at end of preview_scan_done
-   this way it is made sure that xsane.param is correct after preview scan
-   (was not correct in copy mode with lineart=grayscale->lineart preview)
-
- - added explaination of "[DEVICE]" in xsane help message
-
- - gimp handling now is always called in xsane_scan_done
-   (was not called when an error occured or the cancel button was pressed).
-
- - moved selection of fax finemode to fax-project window, image is always scanned
-   in fine mode resolution.
-
- - html-documentation is updated (a bit)
-
- - removed bad "+ 0.5" from calculation in preview_set_option_float: word = SANE_FIX(value) + 0.5;
-
- - included italian translation table (it.po), thanks to Mauro Colorio <macolori@tin.it>
-
- - added error message in xsane_control_option if command failed
-
- - p->startimage is set to 0 in preview_scan_start
-
-
-xsane-0.62 -> 0.63:
--------------------
-
- - added turkish translation (thanks to Togan Muftuoglu <toganm@turk.net>)
-
- - changed gimp interface from 1.0 to 1.1.2x (GParam->GimpParam etc),
-   added xsane-oldgimp.h that adds #defines for the old gimp interface
-
- - added "make uninstall"
-
- - changed confiure.in, added test for x_includes before it is used,
-   renamed it to configure.old
-
- - new configure.in file that does use "sane-config" now to find the sane libraries
-
-
-xsane-0.63 -> 0.64:
--------------------
-
- - changed xsane-oldgimp.h to work with gimp-1.0.4
-
- - added info icon (green triangle with explanation mark)
-
- - added info window function: xsane_back_gtk_info
-
- - ADF mode: if first  scan fails with NO_DOCS => error message: no docs
-             if another scan ends with NO_DOCS => info message: scanned pages: #
-
- - added some accelerator keys. The key definitions may change any time,
-   this is a first test version. The key-definitions are listed in xsane.ACCELKEYS
-
- - added grab_default for close buttton in info and about dialog
-
- - changed test for sane-libs in aclocal.m4, "-lintl" is removed from
-   the output of "sane-config --libs"
-   (this caused segfaults when gettext is included in libc)
-
- - added about translation dialog
-
- - added options "-p", "--print-filenames", if enabled and xsane runs in scanmode it
-   prints names of produced image files to stdout 
-
- - added options "-N name", "--force-filename name", if set the user filename selection
-   is disabled and the given name is used as filename. The filename should be of the
-   form "basename-00001.filetype". The size of the counter has to be suffisunt large.
-
- - some changes in configure script (missing libs needed by sane are not linked any more)
-
-
-xsane-0.64 -> 0.65:
--------------------
-
- - src/Makefile.in: added usage of SANE_CFLAGS and GTK_CFLAGS
-
- - added secure password transmission for authorisation (md5digest)
-
- - ~/.sane/pass is used for reading user:password:resource from file before asking the user
-
- - configure: removed test for X (AC_PATH_X), this is done in GTK (gtk-config)
-   gtk includes and libs are used for png test (because png often is in X directories)
-
- - changed xsane_*_with_pixmap:
-   old status: routines used xsane.histogram_dialog->window as window for gdk_pixmap_create_from_xpm_d()
-     this made problems with preview window if X default color depth differd from X color depth
-   new status: routines are called with parameter GdkWindow *window now.
-
-
-xsane-0.65 -> 0.66:
--------------------
-
- - added setup menu for Automatic Document Feeder Scansource
-   (ADF-Scansource name was predefined to "Automatic Document Feeder" before,
-    now it can be defined for each device (is saved in decice settings))
-
- - changed setup for lineart->grayscale scanmode from entry to menu with available scanmodes
-
- - updated xsane.WIN32-compilation and src/Makefile.in.WIN32
-   I compiled a pre version of xsane-0.66 with the cygwin snapshot from 2000-12-10 and
-   gtk+-dev-20001023.zip, glib-dev-20001023.zip, libiconv-dev-20001007.zip
-   with the way described in xsane.WIN32-compilation without any problems.
-   The problem with the fork() seems to be solved in this cygwin version.
-
- - updated aclocal.m4 and configure (gimp test)
-
-
-xsane-0.66 -> 0.67:
--------------------
-
- - added test if (xsane.adf_scansource) before usage of xsane.adf_scansource
-   (caused segfault when no ADF Scanmode was defined in setup)
-
-
-xsane-0.67 -> 0.68:
--------------------
-
- - changed src/Makefile.in.WIN32 so that the installation directory can
-   be selected by configure --prefix=... and the used paths are more
-   common to the one on unix (/usr/local => c:\sane)
-
- - changed src/Makefile.in.WIN32 for gimp support (uncomment GIMP_LIBS)
-
- - WIN32+gimp-support: set_gimp_PLUG_IN_INFO_PTR(&PLUG_IN_INFO) is called 
-
- - added extern GimpPlugIn PLUG_IN_INFO to xsane.h (needed in xsane.c for win32)
-
- - replaced free(xsane.tile) by g_free(xsane.tile)
-   (the free(...) caused a crash on win32)
-
- - changed aclocal.m4: gimp test does work with gimp-1.0.x version again
-
- - renamed xsane.WIN32 and xsane.WIN32-compilation to xsane-WIN32.txt
-   and xsane-WIN32-compilation.txt (it is easer to use on windows)
-   
- - removed (#ifndef _WIN32) gtk_set_locale() from xsane.c for win32
-   (when it was called gimp plugin created transparent images)
-
- - saved xsane-style.rc in DOS mode (\n\r)
-
-
-xsane-0.68 -> 0.69:
--------------------
-
- - some changes in aclocal.m4 for gimp test:
-   - When gimp-config is not found, the output of gtk-config is used
-   - GTK_CFLAGS or GIMP_CFLAGS are added to CPPFLAGS for test for gimp.h and gimpfeatures.h
-   - GTK_CFLAGS and GTK_LIBS are erased when gimp_config is available
-
- - changed src/Makefile.in: GIMP_CFLAGS is used now
-
- - saved xsane-style.rc in unix mode (\n) because DOS mode (\n\r) made problems
-
- - added new way to call netscape remote command:
-   at first xsane tries to find out if netscape is running, for this it tries to
-   find out if there is a link "~/.netscape/lock". If this link exists netscape should
-   be running and xsane calls "netscape -remote openFile(...)". Otherwise xsane calls
-   "netscape ..."
-
- - changed keywork "netscape-remote" as docviewer to "netscape"
-
- - changed way to find out home directory in xsane-back-gtk.c:
-   now getenv(ENVIRONMENT_HOME_DIR_NAME) is used instead of getpwuid(...)->pw_dir.
-   (getenv is usable for Win32 and unix, getpwuid makes problems on Win32)
-   
-
-
-xsane-0.69 -> 0.70:
--------------------
-
- - removed some bugs in text for pipette in sane-xsane-preview-doc.html
-
- - changed acloacal.m4: when gimp-config is not found we look for gimptool
-
- - for WIN32 the filetypes listed in the filetype menu are ".jpg" and ".tif"
-   instead of ".jpeg" and ".tiff"
-
- - added manufacturer image to bottom of standard and advanced options window.
-   The name of the image is "vendor"-logo.xpm" or "sane-"backend"-logo.xpm",
-   the size of the image should be 256x48 pixels with a transparent background.
-
- - changed src/Makfile.in: *-logo.xpm are installed (make install) and
-   uninstalled (make uninstall) now
-
- - changed src/Makfile.in.WIN32: *-logo.xpm are installed (make install)now
-
- - several changes in xsane-preview.c for rotating preview by 0/90/180/270 degree 
-   the preview rotation is ready now
-
- - added new routine xsane_save_rotate_image to xsane-save.c
-
- - added new routine xsane_save_grayscale_image_as_lineart to xsane-save.c
-
- - lineart images are saved in grayscale mode at first if transformation has to be done
-
- - xsane_save_rotate_image is called beween scanning and saving image
-
- - xsane_save_grayscale_image_as_lineart is called beween rotating and saving image
-
- - aclocal.m4/configure: changed sane_major_version etc to SANE_CURRENT_MAJOR
-
- - fileheader of raw format changed. This format is not defined, but some programs
-   can read it as 16 bit pnm binary data, so we use a compatible header now:
-     P5
-     # This file is in a not public defined data format.
-     # It is a 16 bit gray binary format.
-     # Some programs can read this as pnm/pgm format.
-     # SANE data follows.
-     100 100
-     65535
-
-
-
-xsane-0.70 -> 0.71:
--------------------
-
- - corrected aspect ratio in xsane-preview.c in routine that calculates preview resolution
-
- - corrected user definition of maximum scanner surface
- 
- - added translation of preview menu maximum surface(preset area)
-
- - added tooltip for maximum surface(preset area) menu and rotation menu
-
- - finished  preview_autoselect_scanarea()
-
- - added autoselect scanarea button to preview window
-
- - changed automaitic increase of filename counter:
-   - the step direction and length is not forced to +1,
-     the user can select one of the values -2/-1/0/+1/+2.
-     It is defined by preferences.filename_counter_step.
-     This way it is possible to scan double sided papers
-     with correct automatic page number generation.
-   - the digits are not increased by a loop any more,
-     the number is read, the new number is calculated
-     and the new filename is generated. The user can
-     select a minimum filename counter length now,
-     it is defined in preferences.filename_counter_len
-     and can be selected by the user in setup/saving options
-   - when the number of digits are not enough the number is
-     automatically increased now.
-   - a message comes up when counter gets smaller than 0
-   
- - pipette the color is averaged on a square, the size of the
-   square can be defined by the user
-
- - updated html doc (not complete)
-
- - added tooltips to permission buttons (r,w,x)
-   permission texts: user, group, all, read, write, execute can be translated now.
-
- - added japanese translation (thanks to Kimizuka Tomokazu <sgtom@pluto.dti.ne.jp>)
-
- - renamed oldgimp.h to gimp-1_0-compat.h
-
-
-xsane-0.71 -> 0.72:
--------------------
-
- - changed default postscript viewer from xv to gv
-
- - moved int i, select = 1; in static void xsane_saving_notebook() out of #ifdef HAVE_LIBTIFF block
-
- - filename counter length correction is only done in sane_start when there is a user selectable filename
-
- - if external filename is given the counter len is not touched when not necessary
-
- - added "insert file" function to fax mode
-
- - added output of gamma, brightness and contrast settings to pnm headers
-
- - updated xsane online-documentation (html)
-
- - added license dialog, it is shown when it was not already accepted for this xsane version
-   (tested in local xsane.rc)
-
- - about and about translation dialogs do not set XSane�s sensitivity to false any more
-
- - copyright sign is now always defined as "(c)", can be translated with \251 if character is available
-
- - device preferences are not saved/loaded any more when file selection is aborted
-
- - in xsane_info_dialog the scanner type is translated now
-
- - added accelerator keys to device selection dialog:
-     Escape   -> Cancel
-     F1,F2,.. -> select device number 1,2,...
-
- - added usleep(100ms) in device selection dialog before scanning for devices, this way we make
-   sure that the text "scanning for devices" is displayed
-
- - added some accelarator keys to the preview window:
-    Alt ESC   Cancel Preview Scan
-    Alt KP+  Zoom in
-    Alt KP-  Zoom out
-    Alt KP*  Zoom not
-    Alt KP/  Zoom undo
-    Alt A     Autoselect scanarea
-    Alt V     Select visible scanarea
-
- - added accelerator key Escape to file-selection-dialog, about-dialog and about-translation-dialog
-   attached to cancel/close button
-
- - updated translations:
-   - german translation
-   - czech translation    - thanks to Stanislav Brabec <utx@penguin.cz>
-   - turkish translation  - thanks to Togan Muftuoglo <toganm@yahoo.com>
-   - japanese translation - thanks to Kimizuka Tomokazu <sgtom@pluto.dti.ne.jp>
-   - french translation   - thanks to Laurent Grawet <laurent.grawet@ibelgique.com>
-
-
-xsane-0.72 -> 0.73:
--------------------
-
- - moved call to display license after test for command line options,
-   so it is not necessary to accept the license to print help/version/license
-
- - added slowenian translation, thanks to Ales Kosir <ales.kosir@zaslon.com>
-
- - an error message is printed when a preview file could not be created
-
- - netscape is called with option new-window now
-
- - rotating scanned image uses memory mapped image file if possible
-   thanks to Salvador Pinto Abreu <spa@di.uevora.pt> for his suggestions
-
- - xsane windows are set insensitive while faxproject is generated/queued.
-   For this waitpid is called in a loop.
-
- - before a html documentation is displayed xsane does test if the requetsted file
-   does exist in the subdirectory language_dir = gettext("language_dir")
-   (what e.g. gives "de" for german). If it does exist it is displayed, otherwise
-   the original english doc is displayed.
-   "language_dir" has to be part of the translation table, it should be
-   translated to the correct translation direcotry name, e.g. de for german
-
- - preferences.printer momory is defined dynamicall now (has been defined to 10
-   pointers to printerdefinition before)
-
- - chaged with of some setup fields - have been too small for large fonts
-
- - xsane-scan:xsane_scan_dialog():
-   added test for color scan to the test if gamma tables for red, green and blue
-   exists (coolscan backend defines color gamma tables in grayscale mode
-   what caused segfault in xsane).
-
- - added preselect scanarea after preview scan (selection in enhancment setup)
-
- - added automatic color correction after preview scan (selection in enhancement setup)
-
- - removed bug (that caused segfault when opening setup dialog) in xsane_enhance_notebook
-   while setting up menu itmes for grayscale scanmode selection:
-   replaced xsane.well_known.scanSOURCE xsane.well_known.scanMODE
-
- - added option in prefences/setup saving options: save device preferences at exit
-
- - now using always gdk_window_get_root_origin() to get a position of a window on desktop
-
-
-xsane-0.73 -> 0.74:
--------------------
-
- - transfering data to gimp plugin now is handled like saving to a special file format.
-   this way it is possibe to support handheld scanners and to get advance of
-   some xsane features like image rotation.
-
- - corrected mmap() part in xsane-save.c/rotation: 
-   data is mmaped with offset pos0, the offset pos0 is removed from pointer calculation
-   
- - changed xsane_enhancement_by_histogram() and xsane_histogram_to_gamma(): the ranges
-   for gamma, brightness and contrast are checked correct now
-
- - added function preview_transform_coordinate_window_to_image(), it is used in
-   preview_get_color(). Pipette functions do work with rotated preview now.
-
- - corrected bug in ruler calculation. The rulers do work correct now with rotated preview
-
- - corrected bug in reading 16 bit preview data: sizeof(buf16)-> sizeof(buf)
-   now preview transformation from 16 to 8 bit is as fast as 8 bit preview
-
- - preset areas are defined with position (new) and size (old) now.
-
- - surface changes (size and rotation) do not change the selected preview area
-   any more if possible
-
-
-xsane-0.74 -> 0.75:
--------------------
-
- - xsane_read_image_data() does reduce 16 bit images to 8 bit when necessary/requested
-
- - when scanning with 16 bits/color in gimp mode, to jpeg-file or postscript-file
-   xsane does ask if the image should be reduced to 8 bits/color
-
- - added functions for mirroring preview and mirroring while rotating scan
-
- - moved saving device preferences from xsane_quit() to xsane_scan_win_delete()
-   and replaced call to xsane_quit() by xsane_exit() in choose_device dialog
-   (this could cause a segfault).
-
- - corrected a bug in calculation of histogram for rotation of 270 degree
-
- - added xsane_bound_int(&mid, min, max) to xsane_calculate_auto_enhancement()
-   a segfault could occur when autoenhancement was activated when only a few
-   preview-pixels where available for calculation of autoenhancement values
-
-
-xsane-0.75 -> 0.76:
--------------------
-
- - rotoation routine: mmap does map the full image file (not only from pos0)
-
- - added xsane.depth, it stores the depth of the scanned image,
-   it may differ from xsane.param.depth when lineart is converted to grayscale
-   or 16 bit image is reduced to 8 bit
-
- - preview: preset_area list is read from xsane.rc
-
- - added context menu to preview preset_area menu, the preset areas can
-   be changed by user now
-
- - transformation 16->8 bits/color: replaced val/256 by val >> 8,
-   a user said that his compiler is too stupid for such an optimization
-
- - updated translations: cs, de, fr, ja, sv
-
- - calibration image is not rotated any more
-
- - corrected exposure event handling (drawing of the selection frame)
-
- - added call of preview_restore_image() at the beginning of preview_update_surface().
-   This way the correct image parameters are used for the calculation in
-   preview_update_surface(). preview_restore_image() does not paint the image any
-   more, this is done at the end of preview_update_surface() now.
-
- - corrected bug in xsane_calculate_histogram() with zoomed and rotated preview
-   with angels 90 and 270 degree.
-
- - info dialog does print sane version as #.#.# (instead of #.#) again.
-   sane-dll will return the version of the sane package from sane-1.0.5
-   so it is possible to find out the used library version in most cases.
-
- - xsane-scan.c: scan data is not written with fwrite() in 1 byte steps
-   any more because it looks like some systems (at least HP 9000/B1000
-   (processor PA8500/300 MHz, 384 MB RAM) operating system HP-UX 10.20)
-   have problems with this. The data is stored in the read buffer when
-   any transformation (gamma, 16->8 bit) is needed, the complete
-   buffer that is read with sane_read is written in one part.
-
- - added xsane.spec - created by Sebastian Wenzler <wenzler@techie.com>
-
- - autoselection of scanarea is not done for startimage
-
- - preview image files (level 0-2) are removed and recreated when
-   the temporary directory is changed in the saving setup
-   (Preview scan has to be reacquried after changing the temporary directory)
-
- - directory selection dialogs (change working directory and select temporary directory)
-   do not display filelist and delete-file widgets.
-
- - xsane-preview.c and xsane-gamma.c:
-   - raw preview data is stored with 16 bits/color
-   - gamma correction is done with (8-16) bit to 8 bit enhanced data
-     the gamma input bits is set to 12 (but could be changed if we
-     add a widget that can change this value)
-     12 bit = 4096 values for each gamma table, this is a good
-     compromise between image quality, speed and memory usage
-   - All this slows down gamma and histogram routines, because of this
-     I accelerated these routines again:
-     - replaced field indexes by optimized pointer routines
-     - preview_motion_event_handler improved: continuous mode does use
-       a timer function now. this way the selection has a higher priority
-       than displaying the histograms.
-     - the raw histogram is only recalculated and displayed when it has been changed.
-
- - improved event handling of the histogram sliders:
-   when continuous mode is active xsane_enhancement_by_histogram() is not called
-   directly any more, it is called via the xsane_slider_hold_event handler now
-
- - split setup notebook "saving options" into "saving options" and "image options"
-
- - added option "reduce 16 bit image to 8 bit" to setup/image options
-   This way you can use the preview with the full bit depth the scanner
-   can output and save it as image with 8 bits/color.
-   This is interesting e.g. when you scan slides or negatives.
-
- - changed ouput in parameter box from "width x height (size unit)" to
-   "witdh x height x depth (size unit)"
-
- - filetype menu is displayed correct now when xsane main window is rebuild
-
- - removed a bug in aclocal.m4 wehn gimp was not found
-
-
-xsane-0.76 -> 0.77:
--------------------
-
- - removed "+0.5" in calculation of gamma table. A gamma value of 1.000 does
-   not change the image data any more
-
- - xsane_update_gamma_curve(TRUE /* update raw */); is called when setup dialog is closed
-   (apply and cancel), now the preview is displayed with correct gamma values when setup
-   dialog is closed.
-
- - configure does set gtk parameters correct when compiling gimp testprogram failed
-
- - xsane internal gamma tables for scanning are created after sane_start is called,
-   this makes sure that the gamma table size calculated with param.depth really is correct
-
- - setup uses selected length unit
-
- - length unit is printed in top left edge between rulers in preview window
-
- - when length unit is saved as inch the length unit submenu "in" now is selected at program start
-
- - removed xsane.spec because I got a mail that it does not produce working installations
-
- - length unit also can be selected now when backend length unit is pixel, so it
-   is possible to change the length unit of the setup window
-
- - save device preferneces dialog is opened when user closes setup dialog and any
-   device options have been changed
-
- - replaced all fprintf(stderr, ... by DBG(...
-
- - updated translations: cs, de, fr, ja, sv, tr
-
-
-xsane-0.77 -> 0.78:
--------------------
-
- - when the backend defines a new scanner surface it is updated correct now
-   when the reduced preview surface does not limit the new surface
-   (added expand_surface to preview_update_surface()
-
- - preview scan is aborted when backend sends more image data than expected,
-   the preview image is saved in this case
- 
- - the preview image is saved now when the preview scan is canceld, so the
-   already scanned part of the preview keeps visible
-
- - when two preview levels have comparable quality it is used the preview
-   that is more up to date (scanned later)
-
- - applied sanei_wire.c patches from sane-backends-1.0.5 to xsane-rc-io.c
-
- - changed default values: histogram, and standard options windows are visible by default now
-
- - added function (pirate icon) to delete preview image cache
-
- - added mail project dialog
-
- - added mail setup dialog
-
- - added routines for sending images by mail (base64encoding, mail headers, smtp headers)
-
-
-xsane-0.78 -> 0.79:
--------------------
-
- - added test for lstat in configure/configure.in/config.h.in
-
- - when lstat is available it is used for testing netscape lock file,
-   otherwise stat is used
-
- - changed order of include lines in xsane-save.c
-
- - for OS/2: in xsane_back_gtk_make_path() a colon ":" is replacte by "_"
-
- - changed last argument of xsane_back_gtk_set_tooltip from char to gchar
-
- - added function xsane_widget_test_uposition(GtkWidget *gtk_window)
-   that does test if gdk_window_get_deskrelative_origin or
-   gdk_window_get_root_origin gives the correct positions.
-   test is done with "scanning for devices" window.
-
- - in xsane.c changed #if 1 to #ifdef BUGGY_GTK_TOOLTIPS_SET_COLORS
-
- - split preview_increment_image_y in ... and preview_test_image_y,
-   test is called before a byte is copied into the buffer
-
- - xsane-preview.c: preview_scan_start: preview image memory is only cleaned for
-   single pass mode and 1 pass of 3 pass mode (3 pass preview does work again)
-
- - mail is sent in subprocess
-
- - added "MIME-Version: 1.0" to mail header
-
- - added mail status in mailfile, error messages while sending are stored in this file too
-
- - aclocal.m4 test for gimp: moved saving of GTK_* to beginning of routine,
-   the GTK_* things should be set correct now when gimp-config is not found
-
- - xsane.h: mail is deactivated when png is not available
-
- - added preferences menu item "Medium":
-   The highlight/shadow/gamma values are defined to the intensity range
-   of the selected medium (e.g. agfa negative).
-   If possible the analog highlight/shadow function is used,
-   if not then the scanner internal digital gamma table is used
-   in bot then xsane�s internal gamma correction is used.
-   When the correct medium is selected it only is necessary to
-   do "soft" color corrections. Because of this the 400% values
-   in brightness/contrast have been reduced to 100% values now.
-   This is a typically range that e.g. also is used by the gimp.
-   If someone needs the larger ranges, change the following definitions
-   in sane.h:
-   #define XSANE_BRIGHTNESS_MIN    -100.0
-   #define XSANE_BRIGHTNESS_MAX    100.0
-   #define XSANE_CONTRAST_GRAY_MIN -100.0
-   #define XSANE_CONTRAST_MIN      -100.0
-   #define XSANE_CONTRAST_MAX      100.0
-
- - moved call xsane_update_counter_in_filename as correction for counter length from
-   xsane_start_scan to xsane_scan_dialog (before open command), this way the
-   counter also is correct when the file is not transformed (pnm).
-
- - corrected xsane_update_counter_in_filename: removed some pointer bugs when skipping
-   exisiting filenames 
-
- - added test for os2.h to configure/configure.in
-
- - added set_gimp_PLUG_IN_INFO(&PLUG_IN_INFO); for os2
-
- - removed "+0.5" in calculation of negative preview gamma table. A gamma value of 1.000 does
-   not change the image data any more
-
- - effective user id is set to real user id in all subprocesses
-
- - cancel preview does now only call sane_cancel and tests for SANE_STATUS_CANCELLED while
-   reading image data.
-
-
-xsane-0.79 -> 0.80:
--------------------
-
- - moved setting of medium gamma correction values from xsane_set_medium_callback in xsane.c
-   to xsane_set_medium in xsane-gamma.c
-
- - xsane_set_medium is called in xsane_scan_dialog and in preview_scan
-
- - replaced predefined areas 10x14 cm and 14x10 cm by 10x15 cm and 15x10 cm
-
- - updated documentation (partly)
-
- - correcting image height when canceling conversion to jpeg format,
-   program does not crash any more
-
- - added russian translation - thanks to John Profic <profic@lrn.ru>
-
- - solved problem with lineart image saved as png (wrong byte width)
-
- - moved medium selection menue from preferences menu to xsane main dialog
-
- - inactive backend options are not saved to the device-rc file
-
- - added progress_bar to the paramter list of xsane_save_*
-
- - added xsane-viewer.c and xsane-viewer.h to the src directory
-
- - added fflush(outfile); to end of rotation routine, this seems to
-   solve a problem of incomplete files when rotating the image file
-
- - added routine xsane_read_pnm_header to get correct header offset
-   and read geometrie values
-
- - for saving routines now the header offset and geometrie values of
-   xsane_load_pnm_header are used instead of xsane�s internal values
-
- - changed handling of color identification:
-   old: xsane_color  == 0 => grayscale/lineart
-   new: xsane_colors == 1 => grayscale/lineart
-
- - when image is saved as postscript file (not copy mode etc)
-   then the bounding box exactly surrounds the image now.
-   Removed psfile parts from setup and preferences.
-
- - xsane_widget_test_uposition(gtk_window) does wait now until
-   gtk_window is realized before gtk_widget_set/get_uposition
-   test is done
-
- - for hpux added include of alloca.h to sane.h
-
- - added function xsane_debug_message that is used for DBG when
-   gcc is not used because defines with variable arguments is
-   not ANSI.
-
- - updated translations: cs, de, fr, ja, ru, tr
-
-
-xsane-0.80 -> 0.81:
--------------------
-
- - xsane-gamma.c:
-     void xsane_calculate_raw_histogram(void): changed "maxval_raw = 0;" to "... = 1;"
-     void xsane_calculate_enh_histogram(void): changed "maxval_enh = 0;" to "... = 1;"
-   this avoids a floating point exception on some systems
-
- - xsane-viewer.c: set default viewer size from 400, 400 to
-   0.3 * screen_width, 0.5 * screen height
-
- - xsane-save.c: xsane_save_rotate_image() swaps x and y resolution when
-   rotation 90 or 270 degree
-
- - removed slash at end of mkdir("~/.sane/xsane/"), OS/2 did not like this
-
- - when temporary direcotry is not defined (xsane.rc does not exist)
-   then xsane at first tries to read the environment variable
-   defined by ENVIRONMENT_TEMP_DIR_NAME (default TMP) and if that
-   does not exist it uses a predefined (TEMP_PATH) path.
-   When xsane.rc does exist the temporary directory stored in xsane.rc is used.
-
- - added blur and despeckle selction dialog to select filter radius
-
- - changed viewer and preview window type from GTK_WINDOW_DIALOG to GTK_WINDOW_TOPLEVEL
-
- - preview gamma does not have any effect to the enhanced histogram any more
-
- - preview does medium gamma correction now when scanner does not support
-   gamma tables
-
- - medium selection is disabled for lineart mode, gamma table is set to default
-   in this case. This guarantees that advanced lineart preview (by grayscale scan)
-   does work conform to the real scan.
-
- - default resolution set to 72 dpi (if no resolution is defined by backend)
-
- - added scanning/valid/incomplete/invalid pixmap to preview action area
-
- - preview cancel does call preview_get_image_data after canceling the
-   scan, this makes sure that xsane does detect a cancled scan when
-   gdk_input does not detect closing the select_fd (what happens when
-   the backend does close the select_fd too early (what is allowed by
-   the sane standard))
-
- - scan cancel does make sure that xsane_read_image_data is run
-   after sane_cancel is called
-
- - added SIGTERM handler: xsane_quit() is called on SIGTERM
-
- - when faxproject/xsane-fax-list can not be created an error
-   message is printed and the creation of the project is aborted
-
- - in saving mode temporary conversion file is removed after conversion
-
- - corrected wrong filenames while saving mail image after scanning
-
- - added ocr function to viewer
-
-
-xsane-0.81 -> 0.82:
--------------------
-
- - number of medium items and area definitions is calculated by size of the
-   structure now.
-
- - Improved security of temporary file handling:
-   - replaced mktemp() my mkstemp() in xsane_back_gtk_make_path.
-     The filename format changed because mkstemp creates the file
-     and so it is not possible to add an extension and the file
-     has to end with "XXXXXX" what is replaced by the safe random number
-     generated by mkstemp.
-
-   - before creating the image filename in xsane-scan.c the filename
-     is removed only if the created file is not a temporary file.
-
-   - removed remove() in xsane_save_image_as_lineart()
-
-   - added routine xsane_create_secure_file() that makes sure that the created
-     file does not follow a symlink
-
-
- - when an error occurs while saving a file or the saving is aborted then
-   the created image is removed
-
- - swaped order of opening inputfile and outputfile (outputfile now first) in
-   xsane_save_image_as_lineart()
-
- - viewer_save_callback(): several changes for saving as lineart
-
- - moved xsane_update_histogram() at end of xsane_update_gamma_curve()
-   into if (xsane.preview) block - this avoids segfault on some systems
-
- - despeckle radius and blur radius dialogs are closed before routine is started
-
- - removed bug in despeckle routine
-
- - increased speed of despeckle routine by about factor 6
-
- - changed despeckle radius range from 1-9 to 2-10
-
- - changed blur radius range from 1-9 to 2-20
-
- - routines xsane_draw_histogram_with_*() do not have parameter "int invert" any more,
-   the inversion already is done in the medium dependant histogram of the preview.
-
- - added image scaling routine to viewer
-
- - added spanish translation (es.po) - thanks to 
-   Gustavo D. Vranjes <gvranjes@abaconet.com.ar>
-
- - added dutch translation (nl.po) - thanks to 
-   "Wim Sinke" <sinke@wirehub.nl>
-
-
-xsane-0.82 -> 0.83:
--------------------
-
- - scaling image size does work for 16 bit images now
-
- - xsane_create_secure_file() now always removes the file (not only if it is a link),
-   this is needed because open(..., O_EXCL) does fail when the file exists (what can
-   happend when we want to overwrite an existing file).
-
- - removed buggy ";" at end of if statement in xsane_enhancement_negative_callback
-
- - default mode is viewer instead of saving mode
-
- - updated po-files: nl
-
- - xsane-front-gtk.c: void xsane_progress_cancel(GtkWidget *widget, gpointer data)
-   changed GtkSignalFunc callback = (GtkSignalFunc) data; to
-   GtkFunction callback = (GtkFunction) data;
-
- - added media, experimentally determined values with UMAX Powerlook3:
-   Agfa XRG 200-4
-   Agfa HDC 100
-   Konica VX 100
-   Rossmann HR 100
-
- - preview.c: preview_update_surface calls preview_update_selection at first to
-   make sure that the preview selection is up to date. Now xsane comes up with
-   the saved area selection when e.g. transparency mode is stored which forces
-   a change of the surface
-
- - removed parameter negative from xsane_calculate_auto_enhancement,
-   autoenhancement does work again when negative button is pressed
-
- - added mode "--Medium-definition"/"-M":
-   - preview is done without scanner gamma correction for medium
-   - added two icons to the main dialog: medium new and medium delete
-
- - added xsanedocdir to doc/Makefile.in and src/Makefile.in
-   the path is used by xsane.c and the mentioned Makefiles
-
- - removed in xsane-viewer.c, line 222: xsane_create_secure_file(outputfilename) before
-   xsane_save_image_as(...)
-
-
-xsane-0.83 -> 0.84:
--------------------
-
- - if xsane-license.txt is not found when it shall be displayed then xsane does
-   print an error message and behaves like when the user did not accept the license.
-
- - if xsane-startimage.pnm is not found then an image of the size 1x1 pixel is
-   created instead. This should normally never happen but some people start
-   xsane without that it has been installed. Then the behaviour of the preview
-   has been undefined before.
-
- - removed "rm -f $cache_file" when gtk or sane was not found in configure.in,
-   this was bad when a user used a global cache file
-
- - viewer is created with image size - if possible
-
- - added serbian translation file (sr.po) - thanks to Du�ko Rusmir <drusmir@gmx.ch>
-
- - xsane_sigpipe_handler: changed
-   xsane_cancel_save(0);
-   to
-   xsane_cancel_save(&xsane.cancel_save);
-
- - updated po-files: es, fr, ja, nl, ru, sr, tr
-
- - x and y resolution information are added to jpeg and png files now
-
- - preview zoom buttons are now also available when backend does geometry
-   options with unit pixel
-
- - added Plustek logo
-
-
-xsane-0.84 -> 0.85:
--------------------
-
- - replaced xsane_control_option by back_gtk_set_option in xsane_set_resolution.
-   if changing resolution causes a SANE_RELOAD_OPTIONS this is handled now.
-
- - replaced xsane_save_scaled_image by a routine that does a blur over all covered pixel
-   insetad of using one pixel in the middle of the covered area
-
- - changed radius definition of blur and despeckle, now r=1 means nothing happens
-
- - extended blur routine, radius is now of type float, so you e.g. can blur with a 
-   radius of 1.3.
-
- - replaced all xsane*_scale_new* by xsane*_range_new*, the range can be displayed as:
-   - slider (scale) + value on right
-   - slider (scrollbar) + value on right
-   - spinbutton
-   - scale + spinbutton
-   - scrollbar + spinbutton
-  the user can select, which disply mode he likes to use.
-
- - added timeout callback for xsane_resolution to set correct quantisation
-
- - Some people complained that the user has to accept the GPL to use the program.
-   In fact from the view of the GPL it is not necessary that the user accepts
-   the license to run the program. But it is important that the user reads
-   and accepts the "NO WARRANTY" part of the license. Due to this I created
-   two license dialogs:
-    - EULA-Dialog displays the "NO WARRANTY" part of the GPL
-    - GPL-Dialog displays the compelte GPL
-   To run the program the user has to accept the "NO WARRANTY" agreement
-   after installation and each update of xsane.
-   I hope this compromise is usable for every side. Please understand and
-   accept that it is necessary in some countries that the user accepts the
-   no warranty agreement to make sure that the authors and others do not
-   have to pay any compensation in the case of any damage
-
- - removed bug in scan and in preview-scan 16 bit routines when
-   sane_read returned with odd number of bytes
-
- - reduced maximum filename counter length from 10 digits to 9 digits.
-   (10 digits need more than long int, long long int is not portable (not ANSI C))
-
- - update_counter_in_filename does not touch the counter when step = 0 and
-   min_length = 0
-
- - added preview function autoraise_scanarea (may be the name is stupid?):
-   if you select this function and click to an image then the image
-   is selected as scanarea
-   
- - colored preview pipette icons and zoom icons
-
- - Changes/preparation for gtk+-2.0:
-
-   - added xsane-gtk-1_x-compat.h that wraps gtk+-2.0 functions to gtk+-1.x functions
-     when gtk+-1.x is used
-
-   - replaced all gtk_accel_group_attach() by gtk_window_add_accel_group() and
-     gtk_menu_set_accel_group()
-
-   - repleaced all GTK_WINDOW_DIALOG by GTK_WINDOW_TOPLEVEL
-
-   - addeded alternative part that uses gtk_text_view (gtk+-2.0) instead of gtk_text (gtk+-1.x)
-
-   - repleaced all gtk_signal_connect* by g_signal_connect* and defined makros for gtk+-1.x
-   - repleaced all gtk_signal_handler* by g_signal_handlers* and defined makros for gtk+-1.x
-
-   - repleaced (gtk+-1.x)
-       gtk_widget_draw(hist->pixmapwid, &rect);
-     for gtk+-2.0 by 
-       gtk_widget_queue_draw(hist->pixmapwid);
-       gdk_window_process_updates(hist->pixmapwid->window, FALSE); 
-
-   - filename entry is not set directly by gtk_entry_set_text(), it is set
-     by xsane_set_filename() now
-
-
-xsane-0.85 -> 0.86:
--------------------
-
- - reversed the change of xsane-0.84->0.85 that replaced
-   xsane_control_option by back_gtk_set_option in xsane_set_resolution.
-   If resolution change causes a SANE_RELOAD_OPTIONS this is not handled any
-   more. 
-   Reason: It caused a segfault in different situations when panel_rebuild
-   was called. I tried to implement that it works like expected, but the
-   resolution option needs a lot of special cases handling that makes it
-   very hard to handle this. Also the gtk slider does not work when
-   the panel is rebuild each time when the value is changed.
-
- - increased vendor length from 9 to 12 characters.
-
- - changed dialog of viewer/scale
-   - The dialog uses xsane_range instead of a spinbutton now
-   - The scale sliders for x and y can be binded now,
-
- - added %%Pages: 1 1 to header of postscript files in xsane-save.c
-
- - changed preview zoom icons and function names:
-   - changed icon and name of zoom_in to zoom_area
-   - added new function zoom_in: if enabled a zoom cursor
-     is selected and when the user clicks to the preview
-     with the left or middle mouse button then it is zoomed
-     to the clicked position
-    
-
-xsane-0.86 -> 0.87:
--------------------
-
- - preview_update_maximum_output_size: function sets block bit
-   at beginning of routine and resets it at end of routine, this
-   way it is made sure that the function is not called
-   recursive. This avoids infinite loops when backend
-   changes geometry options.
-   
- - xsane-device-preferences.c: saving and loading device options
-   does test for num_options now
- 
- - added xsane.ipc_pipefd and gdk_input_add(xsane.ipc_pipefd,...),
-   a child process can write to the pipe and xsane displays the
-   text in an error dialog (not for win32)
- - added inter process communication pipe. When a child process
-   wants to display an error message it can write the message to
-   ipc_pipefd[1] and xsane will display the message in an error dialog
-
- - xsane_back_gtk_decision_dialog can handle multiple dialogs now,
-   (used by xsane_back_gtk_error/warning/message/info
-
- - added clear/redraw histogram to xsane_set_sensitivity()
-   removed clear/redraw histogram near calls to xsane_set_sensitivity()
-
- - add xsane_sigchld_handler to cleanup zombie child processes,
-   this replaces xsane_mail_send_process_exited()
-
- - changed progress bar pipe of ocr program:
-   -default option is "-x" (gocr)
-   -default progress keyword is "" (gocr)
-   -expects to values: "%d %d\r", main, sub
-    first value is used for progress bar, both are printed as text
-
- - moved at the end of function xsane_device_dialog()
-   the call xsane_set_all_resolutions(); after xsane_refresh_dialog();
-   this way the backend default resolution is not overwritten at program startup
-
- - changed calculation of aspect for startimage in preview_update_surface() from image aspect
-   to preview aspect
-
- - xsane-scan.c saving lineart image as grayscale does work correct now:
-   - fwrite writes correct number of bytes
-   - x value is stored in global struct XSane so that it is not reset at
-     the beginning of xsane_read_image_data()
-
- - moved ocr routine from xsane-viewer.c to xsane-save.c
-
- - ocr routine can be selected by saving image as ".txt" or ".text" format
-
- - added filetype menu to fileselection dialog
-
- - changed behaviour of filetype menues: the extension immedeatly is added to/changed in
-   the filename (and is not added/corrected when the scan begins).
-   Now the filetype menu does behave the same way as gimp does. This means that
-   you e.g. can select filetype "jpeg" and name the file "image.pnm", in this
-   case the filetype is (like selected) "jpeg". I do not like this, but this is
-   how most programs do handle this situation.
-
- - filetype is saved in preferences
-
- - filetype "by ext" is handled as "" instead of NULL now
-
- - selected working directory is saved in xsane preferences
-
- - error_xpm, warning_xpm and info_xpm got a little 3d look
-
- - added test for gtk2 to aclocal.m4 and configure.in/configure
-
- - added bind_textdomain_codeset(xsane.prog_name, "UTF-8"); after bindtextdomain
-
- - gtk-fileselection for selecting directories: for gtk2:
-   - selection_entry hidden
-   - added "/." to end of predefined path
-   - for gtk1 the text in selection_entry is removed from the filename after selection has finished
-
- - updated translations: de, tr, ja, es, fr, cs, sv
-
- - new translation: sk (slovakian), thanks to Zdenko Podobn� <zdpo@mailbox.sk>
-
- - changed configure script to support gtk2
-    
-
-xsane-0.87 -> 0.88:
--------------------
-
- - xsane_back_gtk_range_new: made sure that digits is not negative
-   and for gtk+-1 that digits<6
-
- - xsane_load_mail_project: changed "char c" to "int c" to get a chance to
-   identify EOF
-
- - xsane_load_fax_project: changed "char c" to "int c" to get a chance to
-   identify EOF
-
- - xsane_resolution_list_callback: changed "gchar *name" to "const gchar *name"
-
- - xsane_add_medium_definition: changed "char *definition_name" to "const gchar *definition_name"
-
- - added xsane-batch-scan.[ch]
-
- - added routine preview_create_batch_icon_from_file() to xsane-preview.c
-
- - xsane_batch_scan_update_icon_list is called by xsane_enhancement_by_gamma via a timer
-   this way a gamma correction also is visible in the icon list
-
- - added xsane.scan_rotation that is used by xsane-scan.c instead of xsane.preview->rotation
-
- - updated translations: cs, de, es, ja, ru, tr
-
-
-xsane-0.88 -> 0.89:
--------------------
-
- - 3 pass scanning: data interleaving is done in buffer, patch by <Oliver.Friedrich@hamburg.de>
-
- - replaced fork() by spawnvp for ocr command in xsane-save.c (patch by Franz Bakan)
-
- - xsane_save_jpeg does reduce a 16bit/sample images to 8bit/sample at first because jpeg does
-   not support 16 bit/sample
-
- - xsane_save_ps does reduce 16bit/sample images to 8bit/sample while saving
-
- - When scanning to file (mode SAVE) then the warning about image depth reduction 16->8 bit/sample
-   for jpeg and postscript is not printed any more.
-
- - Since april 2000 there is defined a pnm (ppm/pgm) format for 16 bit binary images.
-   With this format the unofficial RAW16 format that has been used by xsane until version 0.88
-   becomes senseless. The RAW16 format has been removed, xsane does create 16 bit binary pnm files
-   now (the difference between the RAW16 and the pnm16binary format is that the pnm16binary format
-   always uses MSB first while RAW16 was written in machine byte order).
-   In preferences-Setup->Image there is a selection if the pnm16 image shall be saved in ascii or
-   binary format.
-   When you have any problems with the pnm16binary format then make sure at first that the program
-   you use does support it correct. imagemagic does support it, the xv version 3.10a does not
-   support it.
-
- - read_pnm_header now does read the gamma, contrast, brightness, threshold values, so when these
-   data is saved in an image then it is correct now.
-
- - gamma, brightness, contrast and threshold are added in the header of pnm files now
-
- - when 16 bit image is scanned and "reduce 16bit image to 8bit" is selected and the image
-   is saved as pnm then the file is created correct now
-
- - batch scan thumbnail: replaced gdk_image by gtk_preview
-   gdk_image needs pixel colors based on hardware, gtk_preview uses truecolor pixels.
-
- - added po file converstion to utf8 in po/Makefile[.in]
-
- - added documentation for batch scan window
-
- - changed page size in range from (max-min)*1e-40 to (max-min)*1e-30
-   because some systems like solaris had problems (one long bar that
-   could not be moved)
-
- - xsane-preview.c: in case of an error the error error text is created before
-   preview_scan_done is called when parameters->* are needed for creating the
-   error message
-
- - made html pages compatible to html 4.01
-
- - changed header of postscript files, may be this solves the printing problem on some systems
-
- - added "%%EOF" to end of postscript files
-
- - updated translations: cs, de, fr, ja, nl, ru, sv (update for 0.88), tr
- - new translations: pt, pt_BR
-
- - add no_device icon in error message: no devices available
-
- - added help_no_devices dialog
-
- - added device icon in device_scanning_dialog
-
- - added a frame in the decision dialog
-
- - when preview_autoselect_scanarea does not find an image then
-   the complete image is used
-
- - added accelerator key ESC to decision dialog:
-   when a reject button (right) is available then ESC=reject,
-   when no reject button is available then ESC=OK.
-
- - set block_update_maximum_output_size_clipping in preview_rotation_callback,
-   now rotation does work like expected when in copy mode
-
- - added paper_orientation menu in copy mode
-
-
-
-xsane-0.89 -> 0.90:
--------------------
-
- - replaced "round(i+0.5)" in xsane_save_ps by "ceil(i)" because round is not
-   available on all systems
-
- - replaced order of includes for sys/types.h ans sys/stat.h in xsane.h
-
- - removed some includes from some *.c files that are already in xsane.h
-
- - added to xsane.h:
-   #ifdef HAVE_OS2_H
-   # define strcasecmp stricmp
-   #endif
-
- - always set position of outputfilename_entry to the right
-
- - added test for (pid_status < 0) in xsane_fax_send in routine
-   waiting for child process. The program does continue now
-   when the fax is sent.
-
- - fax setup: added "set program defaults" buttons for efax, hylafax and mgetty+sendfax
-
- - bindtextdomain for backend is set for sane-"backendname" and sane-backends
-   sane-backends is used when sane-"backendname" does not exist (no "" entry)
-
- - set codeset for backend textdomain to "UTF-8"
-
- - xsane-preview.c: motion_notify_event_handler: added 
-   if (p->selection_xedge != -1) and if (p->selection_yedge != -1)
-   before setting new coordinates
-
- - xsane-preview.c: added aspect_ratio function to motion_event_handler
-
- - added aspect_ratio menu to preview window
-
- - xsane-save.c: save_scaled_image: added " 0.5" to round image width and height
-
- - xsane-viewer.c: added widgets to scale dialog that allow defining image size
-
- - aclocal.m4: added "-lintl" when gettext is found in libintl
-
- - aclocal.m4: added warning that check for gtk is not possible when pkg-config
-   is not available
-
- - added romanian (ro.po), vietnamese (vi.po) and danish (da.po) translation
-
- - updated translation based on xsane-0.89 texts: es, it, ru
-
- - updated translations: cs, de, fr, nl, sk, tr
-
- - replaced some signals for spinbutton by signals for adjustments in xsane-viewer.c
-
- - xsane_mail_dialog_close() and xsane_fax_dialog_close():
-   removed gtk_window_remove_accel_group(GTK_WINDOW(xsane.mail_dialog), xsane.accelerator_group);
-
- - xsane-scan.c/xsane_read_image_data() and xsane-preview.c/preview_read_image_data:
-   when we have no select_fd then we don't leave the scanloop with break; but
-   we do a gtk_main_loop and  continue;
-
- - xsane-scan.c and xsane-preview.c: WIN32 now also does use the gdk_input_add functions.
-
- - preview: added output of RGB values of the pixel under the pointer in the preview
-
- - xsane_create_preview_gamma_curve: replaced 255 by 255.99999 to create correct preview gamma table
-
-
-xsane-0.90 -> 0.91:
--------------------
-
- - xsane_generate_dummy_filename(): use temporary file in case xsane.mode == XSANE_GIMP_EXTENSION
-
- - changed <Shift> accellerator keys that used letters to other key (if possible same key with <Ctrl>,
-   because with these accelartor keys it was not possible to enter these letters in any entries.
-
- - added accelerator group to mail dialog again, it is now possible to enter all texts and use
-   the accelerator keys at the same time
-
- - added zoom of image under the pointer to the preview window
-
- - removed all c++ style remarks "//"
-
- - changed behaviour of medium definition mode:
-   - The raw histogram now does show the raw data when the selected medium definition
-     is not set to the full range
-   - When creating a new medium definition the name of the used definition is preset
-   - When creating a new medium definition then this definition is selected
-   - When deleting a definition then the previous definition is selected
-
- - renamed temporary file "preview-level*" to "xsane-preview-level*"
-
- - position of batch scan dialog is saved in device preferences
-
- - added chines tranlation (zh)
-
- - corrected RGBA mode
-
- - added blocking function to viewer: it is not possible to open two dialogs for the same
-   viewer at the same time
-
- - added signal handling for SIGINT and SIGHUP
-
- - in Batch scanning mode sane_cancel is called between all scans! This has to be done
-   because it is not allowed to change scan parameters between sane_start and sane_cancel.
-
-
-xsane-0.91 -> 0.92:
--------------------
-
- - moved setting of preview gamma table from preview_start_scan (called 3 times for
-   3 pass scan) to preview_scan (called once when "preview scan" button is pressed).
-   This should avoid error messages in 3 pass scanning mode
-
- - removed parameter label from xsane_back_gtk_autobutton_new()
-
- - xsane_back_gtk_autobutton_update sets range widget to insensitive in automatic mode
-
- - added jpeg error_exit handler
-
- - added several tests for errors after wrting image data (full disk) (not complete)
-
- - if an advanced option is defined in a standard group then this option is listed in
-   the advanced options window now. For this a standard group also is created in the
-   advanced options window. If a group has no items then the group is not shown.
-
- - an option without SANE_CAP_SOFT_DETECT is not read any more in xsane_control_option
-
- - updated translations: sv
-
-
-xsane-0.92 -> 0.93:
--------------------
-
- - added ranlib to lib/Makefile.in to process liblib.a
-
- - added 2 calls xsane_find_best_resolution() in xsane_resolution_widget_new()
-   to make sure that active value really is selectable in a list of resolutions
-
- - added range values 9-25% to scaling list of xsane-viewer: 9, 13, 18, 25, 35, 50, 71, 100, 141, 200, 282, 400
-
- - when no docviewer is defined at xsane startup (generally when xsane is started the first time) then
-   xsane tries to read the environment variable $BROWSER, if this fails it sets docviewer to netscape.
-
- - xsane-preferences.c: mail dependant entries are only used when mail is activated
-
- - replaced label HAVE_LIBGIMP_GIMP_H by HAVE_ANY_GIMP
-   HAVE_ANY_GIMP is defined in configure.in when HAVE_GIMP=yes
-
- - added HAVE_GIMP_2 parts to xsane.c, xsane.h and xsane-save.c
-   HAVE_GIMP_2 is defined by configure.in when GIMP-2.0 was found
-
- - created subdirectory m4 and put self written macros from aclocal.m4 to m4/*.m4,
-   copied gtk.m4, gtk-2.0.m4 and gimp-2.0.m4 from aclocal installation to m4 subdirectory,
-   gimp-orauch.m4 contains a modified gimp.m4 that also can handle gimp-1.0.x
-   (the original script only does work when gimptool is installed, gimp-1.0.x comes without it)
-   a new aclocal.m4 can be created with "aclocal -I m4/."
-
- - configure.in: changed AM_FUNC_ALLOCA to AC_FUNC_ALLOCA
-
- - configure.in + src/xsane.c: changed PACKAGE_VERSION to XSANE_PACKAGE_VERSION
-   because PACKAGE_VERSION did not work any more, looks like a new feature of aclocal or autoconf
-
- - updated translations: de, it, da, cs, nl, es, sk, ro, fr
-
- - po/Makefile.in: added test for msgfmt, gmsgfmt, gencat
-
-xsane-0.93 -> 0.94:
--------------------
-
- - changed "�s" to UTF8 codeset
-
- - added test and warning message if option is defined without name (NULL)
-   to xsane_panel_build
-
- - added handling for options with of SANE_TYPE_INT and SANE_TYPE FIXED
-   with CONSTRAINT_TYPE_NONE , uses spinbutton, no sliders
-
- - changed default medium definition of Slide from highlight=30% to highlight=40%
-
- - xsane_[back_gtk_]option_menu_new: added empty element to end of list
-   xsane_[back_gtk_]option_menu_lookup: test for existing element before comparision
-
- - moved media defintions from xsane.rc to xsane.mdf
-
- - preview: preset area: added definition name to context menu items
-
- - preview: add preset area: you can change the suggested name now
-
- - medium definitions: added same context menue like in preset area menu,
-   removed buttons "add medium" and "delete medium", they are in the
-   contect menu now
-
- - added documentation how to use a medium and how to define a medium
-
- - improved documentation how to edit the preset area definitions
-
- - in edit medium definition mode autmatic scanarea selection and automatic
-   color correction is disbaled
-
- - docs: replaced www.mostang.com/sane by www.sane-project.org
-         and sane-devel@mostang.com by sane-devel@lists.alioth.debian.org
-
- - batch_scan default list is loaded at program startup
-
- - added test for BUGGY_GDK_INPUT_EXECEPTION in xsane.c and xsane-preview.c
-   when gdk_input_add shall be used
-
- - changed order in xsane.h: system includes are moved to the beginning of
-   the file. This way it is possible to test for operating system header files
-   to decide how some #defines are made
-
- - added m4 makro test for msnative struct for windows
-
- - BUGGY_GDK_INPUT_EXCEPTION is defined for windows
-
- - src/Makefile.in: removed both "\" in
-   -DPATH_XSANE_DOC_DIR=\$(xsanedocdir) -DPATH_SANE_DATA_DIR=\$(sanedatadir)
-
- - created new xsane-WIN32-compilation.txt
-
- - for windows the GTK1 version of xsane_window_get_position is used
-
- - xsane_back_gtk_get_filename: directory is prepared with ending SLASH
-   instead of ending "/.", this does work with windows now when SLASH is \
-
-
-xsane-0.94 -> 0.95:
--------------------
-
- - For xsane-win32 the xsane icon is added to the windows ressource of xsane.exe:
-   added definition of XSANE_ICON=xsane-icon.opc to configure[.in]
-   added creation rule of xsane-icon.opc to src/Makefile[.in]
-   added @XSANE_ICON@ to XSANE_OBJS
-
- - in xsane_back_gtk_value_update: removed rounding (+ 0.5) in case SANE_TYPE_INT
-
- - changed menues in the xsane main dialog:
-   - added new menu "Window"
-   - moved Window menue entries form "View" to "Window"
-   - moved "Show resolution list" entry from menu "Preferences" to "View"
-   - moved "Update policy" entry from menu "Preferences" to "View"
-   - moved "Length unit" entry from menu "Preferences" to "View"
-
- - added test if resolution list is displayed or scale is displayed in
-   xsane_resolution_timer_callback(). Without this test it sometimes
-   happened that pressing CTRL+L (Swap show resolution list) caused a
-   segfault because the timer callback was executed in a moment where the
-   adjustment is not valid
-
- - added: if (???->window)
-   before each: gdk_window_process_updates(???->window)
-   in xsane-gamma.c, this made problems with gtk+2.x
-
- - when a postscript file is added to a faxproject then the original name of the
-   file is also used in the faxproject now. The pagecounter is still increased!
-
- - fax fine mode selection is stored in preferences now
-
- - handling of viewer filenames changed:
-   - when an image is saved in the viewer then the viewer shows the filename in
-     the window title and the viewer remembers the filename
-   - when the image has been changed after it has been saved then the filename
-     in the window title is shown in brackets 
-   - when the filename ends with a number (counter) then the number is automatically
-     increased when the file is saved
-   - when a saved image is cloned then the suggested filename of the cloned image is
-     clone-of-"old-filename"
-
- - viewer: added support for different modification restrictions
-   - VIEWER_NO_MODIFICATION (only view)
-   - VIEWER_NO_NAME_AND_SIZE_MODIFICATION (some filters allowed but keep size, e.g. fax)
-   - VIEWER_NO_NAME_MODIFICATION (use given name, e.g. fax, mail)
-   - VIEWER_FULL_MODIFICATION (normal mode)
-
- - added undo function (1 step) to viewer
-
- - changed menues in the xsane viewer dialog:
-   - added menu "Edit"
-   - added menu "Geometry"
-   - moved Scale function from menu "File" to menu "Geometry"
-   - added rotation and mirror functions to menu "Geometry"
-   - added undo function to menu "Edit"
-
- - changed button boxes/icons in the xsane viewer dialog:
-   - added button boxes equal to menus: file, edit, filters, geometry
-   - added undo icon to edit box
-   - moved blur uand despeckle icon to filter box
-   - moved scale, rotation and mirrir icons to geometry box
-
- - replaced several "char buf[???];" by "char filename[PATH_MAX];"
-
- - changed fax mode:
-   - scanned images are stored in pnm format
-   - for each list entry there is a data and a type information now
-   - internal viewer is used now for pnm-fax files
-   - faxviewer is used for ps files
-   - before sending the fax pnm images are converted into ps images
-   - after sending the fax ps images are erased
-
- - changed e-mail mode:
-   - scanned images are stored in pnm format
-   - for each list entry there is a data and a type information now
-   - internal viewer is used now for pnm-mail files
-   - before sending the mail pnm images are converted into png images
-   - after sending the mail the png images are erased
-   - mail project status is translated now
-   - BUGFIX: end of email text is marked with 0 byte
-
- - added function xsane_viewer_set_sensitivity()
-   - moved all gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE/FALSE); to it
-   - added several gtk_widget_set_sensitive(???_menu, TRUE/FALSE); commands to it
-   - moved almost all v->block_actions to it
-   - now it should not be possible any more to crash xsane by closing the viewer
-     while it is saving something
-
- - added info "reduce to lineart" to image_info + xsane-pnm-header
-
- - renamed viewer v->reduce_to_lineart to v->allow_reduction_to_lineart
-
- - save_image_as() now automatically reduces lineart images to pbm before saving
-
- - new translations: hu
-
- - updated translations: de, es, ja, pt, pt_BR, sk
-
-
-xsane-0.95 -> 0.96:
--------------------
-
- - fax progress bar does not change it's height any more when the fax dialog is resized
-
- - mail progress bar does not change it's height any more when the mail dialog is resized
-
- - added lockfile to mail project. The lockfile contains status and progress information
-   from the mail_send_process and is used to display a progress_bar
-
- - mail status is only translated when it is displayed via gtk, in the data structures
-   the untranslated texts are used
-
- - changed mail_attach_image_png to mail_attach_image, mime type is defined by parameter
-
- - added filetype menu to mail dialog with filetypes PNG, JPEG and TIFF
-
- - bugfix: viewer saves lineart PNM images again as lineart (bug in xsane-0.95)
-
- - when image is saved as pnm and it is not reduced to lineart then the input file
-   is copied with xsane_copy_file => much faster
-  
- - xsane-save.c: reordered function parameters for saving/conversion functions to
-   (outfile, infile,...) or (output_filename, input_filename, ...) 
-   (before we had sometimes infile at first and sometimes outfile at first)
-
- - xsane_set_sensitivity: mail_dialog and fax_dialog:
-   the sensitivity off all but the progress_bar is set
-
- - While mail is prepared (images are converted) the xsane sensitivity is set to
-   FALSE to make sure that the xsane mode is not changed in this case.
-   while sending the mail (after preparation) the xsane sensitivity is set to
-   TRUE and the project entry sensitivity is also TRUE, it is allowed to
-   changed xsane mode and to change the mailproject, because the
-   sending of the mail is done in a separate process, so there is no
-   influence by changing the mail project name.
- 
- - Comment:
-   When xsane is closed while sending one or more mails then xsane is closed
-   but the mail sending subprocesses are not terminated.
-
- - added SMTP (HELO/FROM/RCPT/DATA) errors to mail status
-
- - added xsane.fax_status, it is saved in the first line of the xsane-fax-list
-   this means that the fax project directories are incompatible to earlier versions!
-
- - added mail_status and fax_status = ..._CHANGED when a new page is added to
-   the project
-
- - updated images in documentation
-
- - updated email modus in documentation
-
- - email images are named "image-1" instead of "page-1"
-
- - fax_dialog_delete() and mail_dialog_delete() return TRUE now.
-   In windows it was possible to delete the dialogs what caused
-   a crash when the window should be used or closed.
-
- - translations: U=updated, N=not updated
-   cs da de es fr hu it ja nl pt pt_BR ro ru sk sl sr sv tr vi zh
-   U  U  U  U  U  N  N  U  U  U  U     U  U  N  N  N  N  U  U  N
-
- - xsane-preferences.c: when identifier is unknown or not a string then
-   the parser does not abort or crash any more.
-   XSane now should not have any problems with old config files.
-
-
-xsane-0.96 -> 0.97:
--------------------
-
- - write_smtp_footer(): changed ".\r\n" by "\r\n.\r\n", this
-   solves problems with microsoft exchange servers.
-
- - translations: U=updated, N=not updated, A=added/new
-   cs da de es fr hu it ja nl pl pt pt_BR ro ru sk sl sr sv tr vi zh
-   N  N  N  N  N  N  U  N  N  A  N  N     N  N  N  N  N  N  N  N  U
-
- - xsane-save.c: xsane_copy_file(): removed fclose(infile) and fclose(outfile)
-   this bug caused the error "*** glibc detected *** double free or corruption (!prev): 0x........ ***"
-   with new gelibc versions
-   xsane-save.c: xsane_copy_file_by_name(): added fclose(infile) and fclose(outfile)
-
- - rmoved gtk_events_pending() from the waiting loop in xsane_back_gtk_get_filename,
-   it looks like gtk_events_pending() increases CPU load very much.
-
- - xsane-scan.c: function xsane_reduce_to_lineart(): corrected order of filenames in
-   xsane_save_image_as_lineart()
-
- - xsane_device_dialog(...): uses sane_control_option instead of xsane_control_option
-   to read option number 0. This means that it is not needed that SANE_CAP_SOFT_DETECT
-   is set for option number 0 
-
-
-xsane-0.97 -> 0.98:
--------------------
-
- - void xsane_batch_scan_scan_list(void):
-   added if (gtk_events_pending()) in while (xsane.scanning)
-   (this was removed in xsane-0.97 what made a lot of trouble)
-
- - corrected bad <Toolbox/...> italian transations for gimp plugin
-
- - added Postscript Zlib-Compression and Ascii-85 compression
-   (patch by Julien BLACHE <jb@jblache.org>)
-
- - added (single page) PDF saving routine
-   (patch by Julien BLACHE <jb@jblache.org>)
-
- - added PDF and Postscript to mail-mode. PDF and Postscript documents can not
-   be displayed inline in html mails. I also do not know a way to display a
-   link to a document that is integrated in the mail. So the <IMAGE> tag
-   has no effect for pdf and postscript documents in html mode.
-
- - --print-filenames prints the filenames after conversion, so it is
-   safe that the file exists and is complete
-
- - selected medium definition is stored in preferences now
-
- - BUGFIX for scanners that do not allow to set all resolutions.
-   In fax mode and possibly also in copy mode the created pages
-   had a wrong scaling when the scanner did not support the
-   desired resolution:
-   - xsane_set_resolution returns bestdpi = selected resolution
-   - xsane_set_all_resolutions stores bestdpi as used resolution
-
- - when option 0 (num_options) has not defined SANE_CAP_SOFT_DETECT
-   then xsane prints a warning but does try to read the option value
-
- - added xsane_mode (VIEWER/SAVE/EMAIL/FAX/etc) to preferences
-
- - po/*: all po files are in UTF-8 code now
-   to transform non-UTF-8 po files to UTF-8 put the po file
-   into the IMPORT_PO_DIR directory and call in the po directory
-   "make import-po-files"
-
- - rename xsane-logo2.jpg to xsane-logo.jpg and changed all
-   html files to xsane-logo.jpg
-
- - viewer uses preferences.filetype instead of "by ext"
-
- - localedir for sane-backends is set by sane-prefix instead of xsane-prefix
-
- - replaced printf by g_print to get correct output on non-utf-8 terminals
-
- - question mark '?' and asterisk '*' in filenames are replaced by underscore '_'
-
- - translations: U=updated, N=not updated, A=added/new
-   cs da de es fr hu it ja nl pl pt pt_BR ro ru sk sl sr sv tr vi zh
-   U  U  U  N  N  U  U  N  N  N  N  N     N  U  U  N  N  N  N  N  N
-
-xsane-0.98 -> 0.98a:
---------------------
-
- - corrected gimp_plugin bug:
-   xsane_mode now is hold in xsane.xsane_mode like bevore xsane-0.98,
-   additionally preferences.xsane_mode is used to store the user
-   selection
-   the user selection is loaded at program start when nothing else is predefined
-
-
-xsane-0.98a -> 0.98b:
----------------------
-
- - changed bug in header file due to conficting types in xsane-front-gtk.h
-   from:  int xsane_set_resolution(int well_known_option, double resolution);
-   to: double xsane_set_resolution(int well_known_option, double resolution);
-
-
-xsane-0.98b -> 0.99:
---------------------
-
- - added preferences/setup options:
-   - save_ps_flatdecoded
-   - save_pdf_flatdecoded
-   - fax_ps_flatdecoded
-   - printer[i].ps_flatdecoded
-
- - changed xsane-preferences reading routines for printer definitions and
-   preset area definitions
-
- - changed postscript and tiff saving routines:
-   - split in subroutines:
-     - create_document_header (ps, pdf)
-     - save image as page (ps, pdf, tiff)
-     - create_document_trailer (ps, pdf)
-
- - split xsane.c into xsane.c, xsane-fax-project.c and xsane-mail-project.c
-
- - created xsane-multipage.c that adds a multipage project dialog
-   supported file formats:
-   - ps
-   - pdf
-   - tiff
-
- - corrected viewer to display bits/sample and size correct
-
- - changed handling of viewer filename and filetype selection:
-   when a new viewer window is created then it copies the active
-   filename and filetype. Changing the viewer�s selection does not
-   change the prefered setting any more.
-
- - when no resolution option is available then xsane uses a resolution
-   of 72.0 dpi. This e.g. is used for postscript and PDF.
-
- - changed tiff saving routine:
-   - added deflate (zip) compression for 8 bit and 16 bit / sample images
-   - corrected jpeg rgb compression
-
- - changed mixed up e-mail names (mail, email, e-mail):
-   - all xsane internal names are: email
-   - all user visible texts are  : e-mail
-   - changed acceleration key for email mode to GDK_E
-   - changed command line option from --mail and -m to --email and -e
-
- - changed name of notebook "image" to "filetype"
-
- - when force_filename is set then the filetype is defined by the filename
-   instead of preferences.filetype
-
- - project dialog position is saved in devices preferences now
-
- - when a dialog is closed then the position is stored in preferences
-   so it can be saved when the window is invisible at program exit
-
- - changed handling of ADF:
-   - removed ADF scanmode selection from setup
-   - added entry for number of pages to scan in xsane main dialog
-   - next scan is not started by 
-       g_signal_emit_by_name(xsane.start_button, "clicked"); /* press START button */
-     any more. This executed the next scan before all active scan subroutines
-     have been finished. Now we use
-       gtk_timeout_add(100, (GtkFunction)xsane_scan_dialog, NULL);
-     to start xsane_scan_dialog after 100ms.
-
- - batch scan window now uses preview levels (zoomed previews) to display batch icons
-
- - added ASMTP authentication PLAIN and LOGIN
-
- - changed size definition of preview window for GTK2 to gtk_window_resize()
-
- - added $(DESTDIR) before each destination path in all Makefile.in
-
- - made usage of MKINSTALLDIRS unique in all Makefile.in
-
- - cleaned up subdir intl
-
- - translations: U=updated (* for 0.99-pre1), N=not updated, A=added/new
-   cs da de es fr hu it ja nl pl pt pt_BR ro ru sk sl sr sv tr vi zh
-   U  U  U  N  N  U  N  N  U* U* N  N     N  U  N  U  N  N  U* N  N
-last upd    96 95    96 95       96 96    96    98    76 92    96 96
-
-
-xsane-0.99 -> 0.991:
---------------------
- - replaced all char buf[255], char buf[256] etc by char buf[TEXTBUFSIZE]
-   with #define TEXTBUFSIZE 255
-
- - replaced all char filename[255] etc by char filename[PATH_MAX]
-
- - translations: U=updated (* for 0.99-pre1), N=not updated, A=added/new
-   cs da de es fr hu it ja nl pl pt pt_BR ro ru sk sl sr sv tr vi zh
-   N  N  N  N  N  N  U  N  N  N  N  N     N  N  N  N  N  N  N  N  N
-   99 99 99 96 95 99    95 99 99 96 96    96 99 98 99 76 92 99 96 96
-
- - added default multipage_filetype (PDF).
-   No default multipage_filetype produced the following problem:
-   - error message when creating multipage file: could not create secure file
-
- - lineart images are expanded to grayscale in multipage mode.
-   solves segmentation fault when "show page" in multipage project was selected
-
- - corrected calculation of width and height in copy mode for backends
-   that do not support arbitary resolutions
-
- - multipage mode: lineart images (that are stored as grayscale images)
-   are reduced to lineart before the page is put into the multipage file
-
- - viewer shows image info with bit depth = 1 when reduce_to_lineart is set
-
- - change handling of zoom (photocopy mode):
-   - now there is only one zoom value even if there is a resolution_x and
-     a resolution_y option, zoom_x and zoom_y are removed
-   - the zoom factor is directly used to define the image output size
-     (before the scanresolution was used to define the image output size)
-   - the resolution is not changed any more when an other printer with a
-     different printer resolution is selected
- - replaced all char buf[255], char buf[256] etc by char buf[TEXTBUFSIZE]
-
-xsane-0.991 -> 0.992:
----------------------
- - there was still a bug concerning the gimp plugin
-   when xsane has been quit in copy mode and afterwards
-   started as gimp plugin then xsane used the printer paper
-   size in the preview window. This is solved now:
-   replaced preferences.xsane_mode by xsane.xsane_mode
-   in xsane_define_maximum_output_size()
-
- - xsane_save_scaled_image sometimes did not write the last line
-   and produced a tuncated image. this is corrected now
-
- - viewer: when saved image is cloned and the viewer of the cloned
-   image is closed then no dialog pops up any more
-
- - translations: U=updated, N=not updated, A=added/new
-   ca cs da de es fr hu it ja nl pl pt pt_BR ro ru sk sl sr sv tr vi zh zh_CN
-   A  N  N  N  N  N  N  U  N  N  N  N  N     N  N  N  N  N  N  N  N  N  A
-   99299 99 99 96 95 99    95 99 99 96 96    96 99 98 99 76 92 99 96 96 992
-
- - xsane-preview.c: preview_create_batch_icon():
-   bugfix: files (in) are closed directly after use now,
-   bug report from Norman Hill - thanks
-
- - corrected order of filetypes in xsane_back_gtk_filetype_menu_set_history, now
-   the filetype are not mixed any more when the disk icon is pressed
-
- - replaced all "\n" by "\r\n" in email 
-
- - corrected some signdness warnings in xsane-preview.c (buf)
-
- - fixed memory bug that caused crash when setup was closed (display_notebook):
-   added strdup to preferences.browser = strdup(getenv(STRINGIFY(ENVIRONMENT_BROWSER_NAME)));
-
- - added command line option --xsane-rc / -r to change give alternative filename for xsane.rc
-
- - added support for color management:
-   - added tab "color management" to setup/preferences
-   - preview can display ICC/ICM corrected images with 8bits/color and with 16bits/color input bit depth
-   - viewer can display ICC/ICM corrected images with 8bits/color and with 16bits/color input bit depth
-   - gamma correction and medium selection is disabled when color management is enabled
-   - added support for embedded ICC/ICM files for
-     - tiff
-     - jpeg
-     - png
-     - gimp plugin
-
- - replaced several GtkObject* by GtkWidget* to avoid type-punned-pointer warning
-
- - replaced several (void**) typecasts in xsane-rc-io.c to avoid type-punned-pointer warning
-
-xsane-0.992 -> 0.993:
----------------------
-
- - removed proofing intent options saturation and perceptual, only relative and absolutle colorimetric are available now
-
- - added CMS transformation to saving routines: pnm(8bit), pnm(16bit ascii and binary), png, jpeg, tiff, gimp-plugin, ps, pdf
-   (missing routines: multipage)
-
- - added support for gtk_file_chooser_dialog
-   all filenames are handled as full paths (beginning with a slahs) now,
-   the "change working directory" option has been removed
-
- - made "CANCEL" and "OK" button positions the same as gimp uses it (CANCEL=left, OK=right)
-
- - added browse function for projects directories
-
- - removed bugs in mail mode:
-    write(fd, "\r\n\r\n", 2) -> write(fd, "\r\n\r\n", 4)
-    write(fd, "\r\n", 1)     -> write(fd, "\r\n", 2)
-
- - added embedded ICC profiles for postscript (CSA+CRD) and pdf
-
- - added 12 bits/channel support for postscript
-
- - added flatedecode without Asci85 compression for PDF
-
-
-xsane-0.993 -> 0.994:
----------------------
-
- - corrected postscript bug: moved "/DeviceRGB setcolorspace" and "CSA... setcolorspace" from document setup to page setup
-
- - added black point compensation to printer setup dialog
-
- - xsane-scan.c: if (channels==1) then scanner_default_gray_icm_profile is used instead of scanner_default_color_icm_profile
-
- - xsane-scan.c: bugfix segfault when scanning: when scanner_default_color_icm_profile is not defined then "" is used instead of scanner_default_color_icm_profile
-
diff --git a/xsane.TODO b/xsane.TODO
index f8913e7..bb89685 100644
--- a/xsane.TODO
+++ b/xsane.TODO
@@ -28,6 +28,9 @@ Sign explaination:
     # allow additional image data after each row (is sane standard conform)
     - make visible if the user did a final scan with the recent settings
 
+ preview/copy+fax:
+    # make preview_update_maximum_output_size() depend on
+      scan position instead of printer output position
 
  fax-function:
 ++  # add new image types to fax fileformat: tiff/pbm/g3
diff --git a/xsane.spec b/xsane.spec
index 2f3330e..681288a 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -1,5 +1,5 @@
 %define name xsane
-%define version 0.994
+%define version 0.995
 %define release 1
 %define prefix /usr
author	Julien BLACHE <jblache@debian.org>	2007-11-22 11:42:18 +0100
committer	Mattia Rizzolo <mattia@mapreri.org>	2014-10-03 14:05:42 +0000
commit	95475333e13157b2a9b62c57be7c82d99e0c4460 (patch)
tree	3726327549b591aba1510ff4e56317c12b276243
parent	0db1f3318701235603f80455d7d1e5c1709e5eb1 (diff)
parent	41b1173190f702693b0b4fd2654cf2dc28a447f4 (diff)