Imported Upstream version 1.0.3upstream/1.0.3

7 files changed, 251 insertions, 172 deletions

diff --git a/NEWS b/NEWS
index 00cd43d..0788bf1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 1.0.3
+
+ * Set resolution on ImageMagick generated PDFs
+
 Overview of changes in simple-scan 1.0.2
 
  * Fix crash setting automatic source on some drivers 
diff --git a/configure b/configure
index 66dddd3..d6ded60 100755
--- a/configure
+++ b/configure
@@ -2662,7 +2662,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=simple-scan
- VERSION=1.0.2
+ VERSION=1.0.3
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 82c11c0..77e70d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE(simple-scan, 1.0.2)
+AM_INIT_AUTOMAKE(simple-scan, 1.0.3)
 AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/po/gl.po b/po/gl.po
index e7058e1..201d8a9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-03-11 09:46+1100\n"
-"PO-Revision-Date: 2010-02-13 11:40+0000\n"
-"Last-Translator: Francisco Diéguez <Unknown>\n"
+"PO-Revision-Date: 2010-04-15 21:38+0000\n"
+"Last-Translator: Manuel Xosé Lemos <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "Todas as páxinas do _alimentador"
 #. Tooltip for preferences button
 #: ../data/simple-scan.ui.h:12
 msgid "Configure application preferences"
-msgstr ""
+msgstr "Configurar as preferencias do aplicativo"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -54,7 +54,7 @@ msgstr "Recortar"
 #. Tooltip for crop button
 #: ../data/simple-scan.ui.h:15
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Recortar a páxina seleccionada"
 
 #. Label on email toolbar item
 #: ../data/simple-scan.ui.h:17
@@ -118,12 +118,12 @@ msgstr "Rotar á _dereita"
 #. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:40
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
 
 #. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:42
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Xirar a páxina á dereita (sentido do reloxo)"
 
 #. Label on save to file toolbar item
 #: ../data/simple-scan.ui.h:44
@@ -172,12 +172,12 @@ msgstr "Iniciar un novo documento"
 
 #: ../data/simple-scan.ui.h:61
 msgid "Stop"
-msgstr ""
+msgstr "Deter"
 
 #. Tooltip for stop button
 #: ../data/simple-scan.ui.h:63
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Deter o escaneo actual"
 
 #. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:65
@@ -220,7 +220,7 @@ msgstr "_Documento"
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:79
 msgid "_Email"
-msgstr ""
+msgstr "Correo-_e"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:81
@@ -250,12 +250,12 @@ msgstr "_Contrasinal:"
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:91
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "Resolución _fotográfica:"
 
 #. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:93
 msgid "_Rotate Crop"
-msgstr "_Rotar recorte"
+msgstr "_Rotar o recorte"
 
 #. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:95
@@ -265,7 +265,7 @@ msgstr "_Deter o escaneado"
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:97
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "Resolución de _texto:"
 
 #. Label beside username entry
 #: ../data/simple-scan.ui.h:99
@@ -286,7 +286,7 @@ msgstr "Dirección de escaneado"
 
 #: ../data/simple-scan.schemas.in.h:3
 msgid "Directory to save files to"
-msgstr ""
+msgstr "Directorio no que gardar os ficheiros"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of scanned image in pixels"
@@ -294,15 +294,15 @@ msgstr "Altura da imaxe escaneada en píxeles"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Resolution for photo scans"
-msgstr ""
+msgstr "Resolución para o escaneado de fotos"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Resolution for text scans"
-msgstr ""
+msgstr "Resolución para o escaneado de texto"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution of last scanned image"
-msgstr ""
+msgstr "Resolución da última imaxe escaneada"
 
 #: ../data/simple-scan.schemas.in.h:8
 msgid "SANE device to acquire images from."
@@ -324,6 +324,8 @@ msgstr ""
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"O directorio no que se gardarán os ficheiros. Por omisión usarase o "
+"directorio de documentos."
 
 #: ../data/simple-scan.schemas.in.h:12
 msgid ""
@@ -335,15 +337,15 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:13
 msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
+msgstr "Resolución en puntos por polgada da imaxe escaneada anteriormente."
 
 #: ../data/simple-scan.schemas.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+msgstr "Resolución en puntos por polgada a usar cando se escanean fotos."
 
 #: ../data/simple-scan.schemas.in.h:15
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
+msgstr "Resolución en puntos por polgada a usar cando se escanean textos."
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
@@ -407,7 +409,7 @@ msgstr "Produciuse un fallo ao escanear"
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
 #: ../src/simple-scan.c:194
 msgid "Scanned Document"
-msgstr ""
+msgstr "Documento escaneado"
 
 #. Title of error dialog when save failed
 #: ../src/simple-scan.c:263
@@ -480,27 +482,27 @@ msgstr "Non se puido detectar os escáneres"
 #. Hint to user on why there are no scanners detected
 #: ../src/ui.c:228
 msgid "Please check your scanner is connected and powered on"
-msgstr "Verifique que o seu escaner está conectado e encendido"
+msgstr "Verifique que o seu escaner está conectado e aceso"
 
 #. Error message display when unable to preview image
 #: ../src/ui.c:517
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
 
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.c:756
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (documento de múltiples páxinas)"
 
 #. Save dialog: Label for saving in JPEG format
 #: ../src/ui.c:758
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
 #: ../src/ui.c:760
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (sen perdas)"
 
 #. Save dialog: Dialog title
 #: ../src/ui.c:772
@@ -510,22 +512,22 @@ msgstr "Gardar como..."
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.c:788
 msgid "Image Files"
-msgstr ""
+msgstr "Ficheiros de imaxes"
 
 #. Save dialog: Filter name to show all files
 #: ../src/ui.c:795
 msgid "All Files"
-msgstr ""
+msgstr "Todos os ficheiros"
 
 #. 
 #: ../src/ui.c:800
 msgid "Select File _Type"
-msgstr ""
+msgstr "Elixa o _tipo de ficheiro"
 
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.c:939
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Non é posíble abrir o ficheiro de axuda"
 
 #. The license this software is under (GPL3+)
 #: ../src/ui.c:955
@@ -570,31 +572,32 @@ msgstr "Ferramenta sinxela de escaneo de documentos"
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Francisco Diéguez https://launchpad.net/~frandieguez"
+"  Francisco Diéguez https://launchpad.net/~frandieguez\n"
+"  Manuel Xosé Lemos https://launchpad.net/~mxlemos"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1114
 #, c-format
 msgid "%d dpi (draft)"
-msgstr ""
+msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
 #: ../src/ui.c:1116 ../src/ui.c:1117 ../src/ui.c:1118 ../src/ui.c:1121
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d ppp"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
 #: ../src/ui.c:1120
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for default resolution in resolution list
 #: ../src/ui.c:1143
 #, c-format
 msgid "%d dpi (default)"
-msgstr ""
+msgstr "%d ppp (predeterminada)"
 
 #. Title of dialog when cannot load required files
 #: ../src/ui.c:1175
diff --git a/po/nb.po b/po/nb.po
index b166621..f395bee 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,182 +8,181 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-03-11 09:46+1100\n"
-"PO-Revision-Date: 2010-01-26 22:27+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
+"PO-Revision-Date: 2010-04-17 09:36+0000\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetilbi@stud.ntnu.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:2
 msgid "4&#xD7;6"
-msgstr ""
+msgstr "4&#xD7;6"
 
 #. Radio button for cropping page to A4 size
 #: ../data/simple-scan.ui.h:4
 msgid "A_4"
-msgstr ""
+msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
 #: ../data/simple-scan.ui.h:6
 msgid "A_5"
-msgstr ""
+msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
 #: ../data/simple-scan.ui.h:8
 msgid "A_6"
-msgstr ""
+msgstr "A_6"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
-msgstr ""
+msgstr "Alle sider fra papirmater"
 
 #. Tooltip for preferences button
 #: ../data/simple-scan.ui.h:12
 msgid "Configure application preferences"
-msgstr ""
+msgstr "Sett programinnstillinger"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
-msgstr ""
+msgstr "Beskjær"
 
 #. Tooltip for crop button
 #: ../data/simple-scan.ui.h:15
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Beskjær valgt side"
 
 #. Label on email toolbar item
 #: ../data/simple-scan.ui.h:17
 msgid "Email"
-msgstr ""
+msgstr "E-post"
 
 #. Tooltip for the email toolbar button
 #: ../data/simple-scan.ui.h:19
 msgid "Email the scanned documents"
-msgstr ""
+msgstr "Send skannede dokumenter på e-post"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:21
 msgid "Le_gal"
-msgstr ""
+msgstr "US Le_gal"
 
 #: ../data/simple-scan.ui.h:22
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:24
 msgid "Photo"
-msgstr ""
+msgstr "Bilde"
 
 #. Title of preferences dialog
 #: ../data/simple-scan.ui.h:26
 msgid "Preferences"
-msgstr ""
+msgstr "Brukervalg"
 
 #. Label on print toolbar item
 #: ../data/simple-scan.ui.h:28
 msgid "Print"
-msgstr ""
+msgstr "Skriv ut"
 
 #. Tooltip for print toolbar button
 #: ../data/simple-scan.ui.h:30
 msgid "Print the scanned documents"
-msgstr ""
+msgstr "Skriv ut de skannede dokumentene"
 
 #. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:32
 msgid "Rotate Left"
-msgstr ""
+msgstr "Roter mot venstre"
 
 #. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:34
 msgid "Rotate Right"
-msgstr ""
+msgstr "Roter mot høyre"
 
 #. Menu item to rotate page to left (anti-clockwise)
 #: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
-msgstr ""
+msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
 #: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
-msgstr ""
+msgstr "Roter mot _høyre"
 
 #. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:40
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Roter siden til venstre (mot urviseren)"
 
 #. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:42
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Roter siden til høyre (med urviseren)"
 
 #. Label on save to file toolbar item
 #: ../data/simple-scan.ui.h:44
 msgid "Save"
-msgstr ""
+msgstr "Lagre"
 
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:46
 msgid "Save the current document to a file"
-msgstr ""
+msgstr "Lagre gjeldende dokument til fil"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:48
 msgid "Sc_an"
-msgstr ""
+msgstr "Sk_ann"
 
 #. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:50
 msgid "Scan"
-msgstr ""
+msgstr "Skann"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:52
 msgid "Scan S_ource:"
-msgstr ""
+msgstr "Hent fra:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:54
 msgid "Scan a single page from the scanner"
-msgstr ""
+msgstr "Skann én enkel side fra skanneren"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:56 ../data/simple-scan.desktop.in.h:2
 msgid "Simple Scan"
-msgstr ""
+msgstr "Simple Scan"
 
 #. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:58
 msgid "Single _Page"
-msgstr ""
+msgstr "Enkel _side"
 
 #. Tooltip for new document button
 #: ../data/simple-scan.ui.h:60
 msgid "Start a new document"
-msgstr ""
+msgstr "Begynn et nytt dokument"
 
 #: ../data/simple-scan.ui.h:61
 msgid "Stop"
-msgstr ""
+msgstr "Stopp"
 
 #. Tooltip for stop button
 #: ../data/simple-scan.ui.h:63
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Stopp skanning"
 
 #. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:65
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #. Tooltip for the toolbar document type combo box
 #: ../data/simple-scan.ui.h:67
@@ -192,165 +191,173 @@ msgid ""
 "scans of text documents, or \"Photo\" for slower, higher quality scans of "
 "documents with graphics or photographs."
 msgstr ""
+"Dokumenttypen som skannes. Bruk \"Tekst\" for hurtig skanning med middels "
+"kvalitet av tekstdokumenter, eller \"Bilde\" for langsommere høykvalitets "
+"skanninger av dokumenter med grafikk eller fotografier på."
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:69
 msgid "_Authorize"
-msgstr ""
+msgstr "_Autoriser"
 
 #. Help|Contents menu
 #: ../data/simple-scan.ui.h:71
 msgid "_Contents"
-msgstr ""
+msgstr "_Innhold"
 
 #. Label for page crop submenu
 #: ../data/simple-scan.ui.h:73
 msgid "_Crop"
-msgstr ""
+msgstr "_Beskjær"
 
 #. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:75
 msgid "_Custom"
-msgstr ""
+msgstr "E_gendefinert"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:77
 msgid "_Document"
-msgstr ""
+msgstr "_Dokument"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:79
 msgid "_Email"
-msgstr ""
+msgstr "_E-post"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:81
 msgid "_Help"
-msgstr ""
+msgstr "_Hjelp"
 
 #. Radio button for cropping page to US letter size
 #: ../data/simple-scan.ui.h:83
 msgid "_Letter"
-msgstr ""
+msgstr "US _Letter"
 
 #. Radio button for no crop
 #: ../data/simple-scan.ui.h:85
 msgid "_None"
-msgstr ""
+msgstr "_Ingen"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:87
 msgid "_Page"
-msgstr ""
+msgstr "_Side"
 
 #. Label beside password entry
 #: ../data/simple-scan.ui.h:89
 msgid "_Password:"
-msgstr ""
+msgstr "_Passord:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:91
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "_Bildeoppløsning:"
 
 #. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:93
 msgid "_Rotate Crop"
-msgstr ""
+msgstr "_Roter beskjæringsområdet"
 
 #. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:95
 msgid "_Stop Scan"
-msgstr ""
+msgstr "_Stopp skanning"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:97
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "_Tekstoppløsning"
 
 #. Label beside username entry
 #: ../data/simple-scan.ui.h:99
 msgid "_Username for resource:"
-msgstr ""
+msgstr "_Brukernavn for ressurs:"
 
 #: ../data/simple-scan.desktop.in.h:1
 msgid "Scan Documents"
-msgstr ""
+msgstr "Skann dokumenter"
 
 #: ../data/simple-scan.schemas.in.h:1
 msgid "Device to scan from"
-msgstr ""
+msgstr "Enhet det skal skannes fra"
 
 #: ../data/simple-scan.schemas.in.h:2
 msgid "Direction of scan"
-msgstr ""
+msgstr "Skanneretning"
 
 #: ../data/simple-scan.schemas.in.h:3
 msgid "Directory to save files to"
-msgstr ""
+msgstr "Lagre filer i mappe"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of scanned image in pixels"
-msgstr ""
+msgstr "Høyde på skannede bilder, i pixler"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Resolution for photo scans"
-msgstr ""
+msgstr "Oppløsning for bildeskanning"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Resolution for text scans"
-msgstr ""
+msgstr "Oppløsning for tekstskanning"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution of last scanned image"
-msgstr ""
+msgstr "Oppløsning på sist skannede bilde"
 
 #: ../data/simple-scan.schemas.in.h:8
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "SANE-enhet som bilder skal hentes fra."
 
 #: ../data/simple-scan.schemas.in.h:9
 msgid "TRUE if the application window is maximized"
-msgstr ""
+msgstr "SANN hvis programvinduet er maksimert"
 
 #: ../data/simple-scan.schemas.in.h:10
 msgid ""
 "The direction of the scanner across the scanned page. It can be one of the "
 "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 msgstr ""
+"Retning skanneren skal gjøre over siden. Den kan være en av følgende: 'topp-"
+"til-bunn' 'bunn-til-topp' 'venstre-til-høyre' 'høyre-til-venstre'"
 
 #: ../data/simple-scan.schemas.in.h:11
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
+msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
 
 #: ../data/simple-scan.schemas.in.h:12
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
+"Høyden på skannet bilde, i pixler. Verdien settes til sist skannede side."
 
 #: ../data/simple-scan.schemas.in.h:13
 msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
+msgstr "Oppløsning i punkter-per-tomme til sist utførte skanning."
 
 #: ../data/simple-scan.schemas.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
 
 #: ../data/simple-scan.schemas.in.h:15
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
+msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The width of scanned image in pixels. This value is updated to what the last "
 "scanned page was."
 msgstr ""
+"Bredden på skannede bilder, i pixler. Denne verdien settes til størrelsen "
+"fra sist skannede side."
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "Type of document being scanned"
-msgstr ""
+msgstr "Dokumenttype som skannes"
 
 #: ../data/simple-scan.schemas.in.h:18
 msgid ""
@@ -358,53 +365,56 @@ msgid ""
 "photos. This setting decides on the scan resolution, colors and post-"
 "processing."
 msgstr ""
+"Dokumenttype som skannes. 'tekst' for tekstdokumenter, 'bilde' for bilder. "
+"Denne innstillinger bestemmer oppløsning, farger og etterbehandling for "
+"skanningen."
 
 #: ../data/simple-scan.schemas.in.h:19
 msgid "Width of scanned image in pixels"
-msgstr ""
+msgstr "Bredde på skannet bilde, i pixler"
 
 #: ../data/simple-scan.schemas.in.h:20
 msgid "Window height in pixels"
-msgstr ""
+msgstr "Vindushøyde i pixler"
 
 #: ../data/simple-scan.schemas.in.h:21
 msgid "Window width in pixels"
-msgstr ""
+msgstr "Vindusbredde i pixler"
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.c:852
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Ingen skanner tilgjengelig. Vennligst koble til en skanner."
 
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.c:879
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "Klarte ikke å koble til skanneren"
 
 #. Error display when unable to start scan
 #: ../src/scanner.c:1101
 msgid "Unable to start scan"
-msgstr ""
+msgstr "Klarte ikke å sette i gang skanneren"
 
 #. Error displayed when communication with scanner broken
 #: ../src/scanner.c:1119 ../src/scanner.c:1212
 msgid "Error communicating with scanner"
-msgstr ""
+msgstr "Det oppsto en kommunikasjonsfeil mellom skanneren og datamaskinen"
 
 #. Title of error dialog when scan failed
 #: ../src/simple-scan.c:176
 msgid "Failed to scan"
-msgstr ""
+msgstr "Klarte ikke å utføre skanningen"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
 #: ../src/simple-scan.c:194
 msgid "Scanned Document"
-msgstr ""
+msgstr "Skannet dokument"
 
 #. Title of error dialog when save failed
 #: ../src/simple-scan.c:263
 msgid "Failed to save file"
-msgstr ""
+msgstr "Lagring av fil mislyktes"
 
 #. Description on how to use simple-scan displayed on command-line
 #: ../src/simple-scan.c:380
@@ -413,6 +423,8 @@ msgid ""
 "Usage:\n"
 "  %s [DEVICE...] - Scanning utility"
 msgstr ""
+"Bruk:\n"
+"  %s [ENHET...] - Skanneutstyr"
 
 #. Description on how to use simple-scan displayed on command-line
 #: ../src/simple-scan.c:388
@@ -425,6 +437,12 @@ msgid ""
 "  --help-all                      Show all help options\n"
 "  --help-gtk                      Show GTK+ options"
 msgstr ""
+"Alternativer for hjelp:\n"
+"  -d, --debug                     Vis feilsøkingsinformasjon\n"
+"  -v, --version                   Vis utgivelsesinformasjon\n"
+"  -h, --help                      Vis alternativer for hjelp\n"
+"  --help-all                      Vis alle alternativer for hjelp\n"
+"  --help-gtk                      Vis alternativer for GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
 #: ../src/simple-scan.c:400
@@ -440,67 +458,76 @@ msgid ""
 "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 "  --g-fatal-warnings              Make all warnings fatal"
 msgstr ""
+"GTK+ Options:\n"
+"  --class=CLASS                   Program class as used by the window "
+"manager\n"
+"  --name=NAME                     Program name as used by the window "
+"manager\n"
+"  --screen=SCREEN                 X screen to use\n"
+"  --sync                          Make X calls synchronous\n"
+"  --gtk-module=MODULES            Load additional GTK+ modules\n"
+"  --g-fatal-warnings              Make all warnings fatal"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
 #: ../src/ui.c:127
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr ""
+msgstr "Behøver brukernavn og passord for å få tilgang til '%s'"
 
 #. Warning displayed when no scanners are detected
 #: ../src/ui.c:226
 msgid "No scanners detected"
-msgstr ""
+msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
 #: ../src/ui.c:228
 msgid "Please check your scanner is connected and powered on"
-msgstr ""
+msgstr "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"
 
 #. Error message display when unable to preview image
 #: ../src/ui.c:517
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Åpning av forhåndsvisning mislyktes"
 
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.c:756
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (flersidig dokument)"
 
 #. Save dialog: Label for saving in JPEG format
 #: ../src/ui.c:758
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (komprimert)"
 
 #. Save dialog: Label for saving in PNG format
 #: ../src/ui.c:760
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (tapsfri)"
 
 #. Save dialog: Dialog title
 #: ../src/ui.c:772
 msgid "Save As..."
-msgstr ""
+msgstr "Lagre som..."
 
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.c:788
 msgid "Image Files"
-msgstr ""
+msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
 #: ../src/ui.c:795
 msgid "All Files"
-msgstr ""
+msgstr "Alle Filer"
 
 #. 
 #: ../src/ui.c:800
 msgid "Select File _Type"
-msgstr ""
+msgstr "Velg fil_type"
 
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.c:939
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Kan ikke åpne hjelpfil"
 
 #. The license this software is under (GPL3+)
 #: ../src/ui.c:955
@@ -518,22 +545,35 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
 #: ../src/ui.c:969
 msgid "About Simple Scan"
-msgstr ""
+msgstr "Om Simple Scan"
 
 #. Description of program
 #: ../src/ui.c:972
 msgid "Simple document scanning tool"
-msgstr ""
+msgstr "Enkelt verktøy for å skanne dokumenter"
 
 #: ../src/ui.c:981
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Hans Rødtang https://launchpad.net/~hansrodtang\n"
+"  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  Kåre Birger Lapstuen https://launchpad.net/~lapstue\n"
 "  Mats Taraldsvik https://launchpad.net/~meastp"
 
@@ -541,41 +581,41 @@ msgstr ""
 #: ../src/ui.c:1114
 #, c-format
 msgid "%d dpi (draft)"
-msgstr ""
+msgstr "%d dpi (kladd)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
 #: ../src/ui.c:1116 ../src/ui.c:1117 ../src/ui.c:1118 ../src/ui.c:1121
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
 #: ../src/ui.c:1120
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (høy oppløsning)"
 
 #. Preferences dialog: Label for default resolution in resolution list
 #: ../src/ui.c:1143
 #, c-format
 msgid "%d dpi (default)"
-msgstr ""
+msgstr "%d dpi (standard)"
 
 #. Title of dialog when cannot load required files
 #: ../src/ui.c:1175
 msgid "Files missing"
-msgstr ""
+msgstr "Manglende filer"
 
 #. Description in dialog when cannot load required files
 #: ../src/ui.c:1177
 msgid "Please check your installation"
-msgstr ""
+msgstr "Vennligst undersøk installasjonen"
 
 #. Button in error dialog to open prefereces dialog and change scanner
 #: ../src/ui.c:1339
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Bytt _skanner"
 
 #: ../src/ui.c:1463
 msgid "Scanned Document.pdf"
-msgstr ""
+msgstr "Skannet_dokument.pdf"
diff --git a/po/uk.po b/po/uk.po
index 09856fb..1c358fd 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-03-11 09:46+1100\n"
-"PO-Revision-Date: 2010-02-13 11:19+0000\n"
+"PO-Revision-Date: 2010-04-15 09:32+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "Всі сторінки з _лотка"
 #. Tooltip for preferences button
 #: ../data/simple-scan.ui.h:12
 msgid "Configure application preferences"
-msgstr ""
+msgstr "Налаштувати параметри програми"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -54,7 +54,7 @@ msgstr "Обрізати"
 #. Tooltip for crop button
 #: ../data/simple-scan.ui.h:15
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Обрізати позначену сторінку"
 
 #. Label on email toolbar item
 #: ../data/simple-scan.ui.h:17
@@ -118,12 +118,12 @@ msgstr "Обернути п_раворуч"
 #. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:40
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Обертати сторінку ліворуч (проти годинникової стрілки)"
 
 #. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:42
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Обертати сторінку праворуч (за годинниковою стрілкою)"
 
 #. Label on save to file toolbar item
 #: ../data/simple-scan.ui.h:44
@@ -138,7 +138,7 @@ msgstr "Зберегти поточний документ до файла"
 #. Scan menu item
 #: ../data/simple-scan.ui.h:48
 msgid "Sc_an"
-msgstr ""
+msgstr "С_канування"
 
 #. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:50
@@ -172,12 +172,12 @@ msgstr "Почати новий документ"
 
 #: ../data/simple-scan.ui.h:61
 msgid "Stop"
-msgstr ""
+msgstr "Зупинити"
 
 #. Tooltip for stop button
 #: ../data/simple-scan.ui.h:63
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Припинити поточне сканування"
 
 #. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:65
@@ -191,6 +191,10 @@ msgid ""
 "scans of text documents, or \"Photo\" for slower, higher quality scans of "
 "documents with graphics or photographs."
 msgstr ""
+"Тип документа, який ви скануєте. Користайтеся варіантом «Текстовий» для "
+"швидкого сканування з посередньою якістю текстових документів. Варіант "
+"«Фотографія» краще пасує для повільного сканування з високою якістю "
+"документів з графічними вставками або фотографій."
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:69
@@ -200,7 +204,7 @@ msgstr "_Уповноваження"
 #. Help|Contents menu
 #: ../data/simple-scan.ui.h:71
 msgid "_Contents"
-msgstr ""
+msgstr "_Вміст"
 
 #. Label for page crop submenu
 #: ../data/simple-scan.ui.h:73
@@ -220,7 +224,7 @@ msgstr "Д_окумент"
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:79
 msgid "_Email"
-msgstr ""
+msgstr "_Надіслати ел. поштою"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:81
@@ -250,7 +254,7 @@ msgstr "_Пароль:"
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:91
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "Роздільна здатність _фотографій:"
 
 #. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:93
@@ -265,7 +269,7 @@ msgstr "П_рипинити сканування"
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:97
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "Роздільна здатність _тексту:"
 
 #. Label beside username entry
 #: ../data/simple-scan.ui.h:99
@@ -286,7 +290,7 @@ msgstr "Напрямок сканування"
 
 #: ../data/simple-scan.schemas.in.h:3
 msgid "Directory to save files to"
-msgstr ""
+msgstr "Каталог збережених файлів"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of scanned image in pixels"
@@ -294,15 +298,15 @@ msgstr "Висота сканованого зображення у піксел
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Resolution for photo scans"
-msgstr ""
+msgstr "Роздільна здатність для сканування фотографій"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Resolution for text scans"
-msgstr ""
+msgstr "Роздільна здатність для сканування тексту"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution of last scanned image"
-msgstr ""
+msgstr "Роздільна здатність попереднього сканованого зображення"
 
 #: ../data/simple-scan.schemas.in.h:8
 msgid "SANE device to acquire images from."
@@ -325,6 +329,8 @@ msgstr ""
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Каталог, до якого слід зберігати файли. Якщо не буде вказано, типовим "
+"вважатиметься каталог документів."
 
 #: ../data/simple-scan.schemas.in.h:12
 msgid ""
@@ -337,14 +343,15 @@ msgstr ""
 #: ../data/simple-scan.schemas.in.h:13
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
+"Роздільна здатність у точках на дюйм попереднього сканованого зображення."
 
 #: ../data/simple-scan.schemas.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+msgstr "Роздільна здатність у точках на дюйм для сканування фотографій."
 
 #: ../data/simple-scan.schemas.in.h:15
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
+msgstr "Роздільна здатність у точках на дюйм для сканування тексту."
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
@@ -410,7 +417,7 @@ msgstr "Помилка сканування"
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
 #: ../src/simple-scan.c:194
 msgid "Scanned Document"
-msgstr ""
+msgstr "Сканований документ"
 
 #. Title of error dialog when save failed
 #: ../src/simple-scan.c:263
@@ -488,22 +495,22 @@ msgstr "Будь ласка, перевірте, чи з’єднано ваш �
 #. Error message display when unable to preview image
 #: ../src/ui.c:517
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Не вдалося запустити програму для перегляду зображення"
 
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.c:756
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (багатосторінковий документ)"
 
 #. Save dialog: Label for saving in JPEG format
 #: ../src/ui.c:758
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (стиснений)"
 
 #. Save dialog: Label for saving in PNG format
 #: ../src/ui.c:760
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (без втрат)"
 
 #. Save dialog: Dialog title
 #: ../src/ui.c:772
@@ -513,22 +520,22 @@ msgstr "Зберегти як..."
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.c:788
 msgid "Image Files"
-msgstr ""
+msgstr "Файли зображень"
 
 #. Save dialog: Filter name to show all files
 #: ../src/ui.c:795
 msgid "All Files"
-msgstr ""
+msgstr "Всі файли"
 
 #. 
 #: ../src/ui.c:800
 msgid "Select File _Type"
-msgstr ""
+msgstr "Вибрати _тип файла"
 
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.c:939
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Не вдалося відкрити файл довідки"
 
 #. The license this software is under (GPL3+)
 #: ../src/ui.c:955
@@ -579,25 +586,25 @@ msgstr ""
 #: ../src/ui.c:1114
 #, c-format
 msgid "%d dpi (draft)"
-msgstr ""
+msgstr "%d т/д (чернетка)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
 #: ../src/ui.c:1116 ../src/ui.c:1117 ../src/ui.c:1118 ../src/ui.c:1121
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d т/д"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
 #: ../src/ui.c:1120
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d т/д (висока роздільність)"
 
 #. Preferences dialog: Label for default resolution in resolution list
 #: ../src/ui.c:1143
 #, c-format
 msgid "%d dpi (default)"
-msgstr ""
+msgstr "%d т/д (типова)"
 
 #. Title of dialog when cannot load required files
 #: ../src/ui.c:1175
diff --git a/src/book.c b/src/book.c
index 8493c84..0dce5f0 100644
--- a/src/book.c
+++ b/src/book.c
@@ -284,7 +284,7 @@ book_save_pdf_with_imagemagick (Book *book, GFile *file, GError **error)
     for (iter = book->priv->pages; iter && result; iter = iter->next) {
         Page *page = iter->data;
         GFile *jpeg_file, *tiff_file;
-        gchar *path;
+        gchar *path, *resolution_command, *stdout_text = NULL, *stderr_text = NULL;
         gint jpeg_size, tiff_size;
 
         jpeg_file = get_temporary_file ("simple-scan", "jpg");
@@ -302,6 +302,25 @@ book_save_pdf_with_imagemagick (Book *book, GFile *file, GError **error)
             path = g_file_get_path (jpeg_file);
         else
             path = g_file_get_path (tiff_file);
+
+        resolution_command = g_strdup_printf ("convert %s -density %d %s", path, page_get_dpi (page), path);
+        result = g_spawn_command_line_sync (resolution_command, &stdout_text, &stderr_text, &exit_status, error);
+        if (result && exit_status != 0) {
+            g_warning ("ImageMagick returned error code %d, command line was: %s", exit_status, resolution_command);
+            g_warning ("stdout: %s", stdout_text);
+            g_warning ("stderr: %s", stderr_text);
+            result = FALSE;
+            g_set_error (error, BOOK_TYPE, 0,
+                         "ImageMagick returned error code %d\n"
+                         "\n"
+                         "Command line: %s\n"
+                         "Stdout: %s\n"
+                         "Stderr: %s",
+                         exit_status, resolution_command, stdout_text, stderr_text);
+        }
+        if (!result)
+            break;
+      
         g_string_append_printf (command_line, " %s", path);
         g_free (path);
     }
@@ -321,7 +340,13 @@ book_save_pdf_with_imagemagick (Book *book, GFile *file, GError **error)
             g_warning ("stdout: %s", stdout_text);
             g_warning ("stderr: %s", stderr_text);
             result = FALSE;
-            g_set_error (error, BOOK_TYPE, 0, "ImageMagick returned error code %d, command line was: %s", exit_status, command_line->str);
+            g_set_error (error, BOOK_TYPE, 0,
+                         "ImageMagick returned error code %d\n"
+                         "\n"
+                         "Command line: %s\n"
+                         "Stdout: %s\n"
+                         "Stderr: %s",
+                         exit_status, command_line->str, stdout_text, stderr_text);
         }
         g_free (stdout_text);
         g_free (stderr_text);