Merge commit 'upstream/2.31.90.2'

6 files changed, 191 insertions, 156 deletions

diff --git a/NEWS b/NEWS
index f2b004c..c861430 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 2.31.90.2
+
+  * Fix crash saving cropped pages
+
 Overview of changes in simple-scan 2.31.90.1
 
   * Store scanned pages in raw format, not converted to 8 bit RGB.  This uses
diff --git a/configure b/configure
index b10bc4a..aad2a8c 100755
--- a/configure
+++ b/configure
@@ -2678,7 +2678,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=simple-scan
- VERSION=2.31.90.1
+ VERSION=2.31.90.2
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 9366e11..3695769 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, 2.31.90.1)
+AM_INIT_AUTOMAKE(simple-scan, 2.31.90.2)
 AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/po/en_GB.po b/po/en_GB.po
index 50fe33f..0dd4453 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-11 04:04+0000\n"
-"PO-Revision-Date: 2010-03-23 12:03+0000\n"
-"Last-Translator: Alex Denvir <coldfff@blueyonder.co.uk>\n"
+"POT-Creation-Date: 2010-08-16 06:40+0000\n"
+"PO-Revision-Date: 2010-08-15 13:46+0000\n"
+"Last-Translator: James Thorrold <jameslin@inbox.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@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-07-14 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "All Pages From _Feeder"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Back"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "Crop the selected page"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Front"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Front and Back"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "New"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Page Size:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@ msgstr "Save"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Save document to a file"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@ msgstr "Scan S_ource:"
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Scan Side:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -280,7 +280,7 @@ msgstr "Directory to save files to"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Height of paper in tenths of a mm"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@ msgstr "Height of scanned image in pixels"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Page side to scan"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -336,11 +336,14 @@ msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 msgstr ""
+"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -367,6 +370,8 @@ msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -384,7 +389,7 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Width of paper in tenths of a mm"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -414,7 +419,7 @@ msgid "Unable to start scan"
 msgstr "Unable to start scan"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1338
+#: ../src/scanner.c:1240 ../src/scanner.c:1346
 msgid "Error communicating with scanner"
 msgstr "Error communicating with scanner"
 
@@ -539,30 +544,30 @@ msgstr "Failed to save file"
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:552
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "If you don't save, changes will be permanently lost."
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Save current document?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
 msgid "Discard Changes"
-msgstr ""
+msgstr "Discard Changes"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:949
+#: ../src/ui.c:950
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1245
+#: ../src/ui.c:1246
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1260
+#: ../src/ui.c:1261
 msgid ""
 "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"
@@ -591,78 +596,79 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1274
+#: ../src/ui.c:1275
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1277
+#: ../src/ui.c:1278
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.c:1286
+#: ../src/ui.c:1287
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alex Denvir https://launchpad.net/~coldfff\n"
 "  Jonathon Hodges https://launchpad.net/~jonblondie\n"
+"  Kaustav Das Modak https://launchpad.net/~kaustav-dasmodak\n"
 "  Malcolm Parsons https://launchpad.net/~malcolm-parsons\n"
 "  solar.george https://launchpad.net/~solar.george"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1304
+#: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Save document before quitting?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1306
+#: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Quit without Saving"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1448
+#: ../src/ui.c:1449
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
+#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1454
+#: ../src/ui.c:1455
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1477
+#: ../src/ui.c:1478
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1522
+#: ../src/ui.c:1523
 msgid "Files missing"
 msgstr "Files missing"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1524
+#: ../src/ui.c:1525
 msgid "Please check your installation"
 msgstr "Please check your installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1581
+#: ../src/ui.c:1582
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1587
+#: ../src/ui.c:1588
 msgid "Automatic"
-msgstr ""
+msgstr "Automatic"
 
-#: ../src/ui.c:1865
+#: ../src/ui.c:1866
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
diff --git a/po/ro.po b/po/ro.po
index d3b3bf6..8425ab2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,21 +2,21 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# Lucian Adrian Grijincu <lucian.grijincu@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-11 04:04+0000\n"
-"PO-Revision-Date: 2010-01-26 22:27+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
-"Language-Team: Romanian <ro@li.org>\n"
+"POT-Creation-Date: 2010-08-16 06:40+0000\n"
+"PO-Revision-Date: 2010-08-16 01:57+0000\n"
+"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
+"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-14 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: ro\n"
 
 #. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:2
@@ -41,30 +41,30 @@ 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 "Toate paginile de la tava cu _foi de hârtie"
 
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Verso"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
-msgstr ""
+msgstr "Decupează"
 
 #: ../data/simple-scan.ui.h:14
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Decupează pagina selectată"
 
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Față"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Față și verso"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -73,12 +73,12 @@ msgstr "Le_gal"
 
 #: ../data/simple-scan.ui.h:21
 msgid "New"
-msgstr ""
+msgstr "Nou"
 
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Dimensiunea paginii:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -93,12 +93,12 @@ msgstr "Preferințe"
 #. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:29
 msgid "Rotate Left"
-msgstr ""
+msgstr "Rotește la stânga"
 
 #. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:31
 msgid "Rotate Right"
-msgstr ""
+msgstr "Rotește la dreapta"
 
 #. Menu item to rotate page to left (anti-clockwise)
 #: ../data/simple-scan.ui.h:33
@@ -113,46 +113,46 @@ msgstr "Rotește la _dreapta"
 #. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:37
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Rotește pagina la stânga (în sens invers acelor de ceasornic)"
 
 #. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:39
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Rotește pagina la dreapta (în sensul acelor de ceasornic)"
 
 #: ../data/simple-scan.ui.h:40
 msgid "Save"
-msgstr ""
+msgstr "Salvează"
 
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Salvează documentul ca fișier"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
 msgid "Sc_an"
-msgstr ""
+msgstr "Sc_anează"
 
 #. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:46
 msgid "Scan"
-msgstr ""
+msgstr "Scanează"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:48
 msgid "Scan S_ource:"
-msgstr "Scanează s_ursa:"
+msgstr "S_ursă scanare:"
 
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Partea scanată:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
 msgid "Scan a single page from the scanner"
-msgstr ""
+msgstr "Scanați o singură pagină din scaner"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
@@ -167,16 +167,16 @@ msgstr "O singură _pagină"
 #. Tooltip for new document button
 #: ../data/simple-scan.ui.h:58
 msgid "Start a new document"
-msgstr ""
+msgstr "Începeți un document nou"
 
 #: ../data/simple-scan.ui.h:59
 msgid "Stop"
-msgstr ""
+msgstr "Oprește"
 
 #. Tooltip for stop button
 #: ../data/simple-scan.ui.h:61
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Oprește scanarea curentă"
 
 #. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:63
@@ -191,7 +191,7 @@ msgstr "_Autorizează"
 #. Help|Contents menu
 #: ../data/simple-scan.ui.h:67
 msgid "_Contents"
-msgstr ""
+msgstr "_Cuprins"
 
 #. Label for page crop submenu
 #: ../data/simple-scan.ui.h:69
@@ -211,7 +211,7 @@ msgstr "_Document"
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:75
 msgid "_Email"
-msgstr ""
+msgstr "_Email"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:77
@@ -241,7 +241,7 @@ msgstr "_Parolă:"
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "Rezoluție _foto :"
 
 #. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:89
@@ -251,12 +251,12 @@ msgstr "_Rotește zona decupată"
 #. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:91
 msgid "_Stop Scan"
-msgstr ""
+msgstr "Oprește _scanarea"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "Rezoluție _text:"
 
 #. Label beside username entry
 #: ../data/simple-scan.ui.h:95
@@ -265,107 +265,120 @@ msgstr "Numele de _utilizator pentru resursă:"
 
 #: ../data/simple-scan.desktop.in.h:1
 msgid "Scan Documents"
-msgstr ""
+msgstr "Scanează documente"
 
 #: ../data/simple-scan.schemas.in.h:1
 msgid "Device to scan from"
-msgstr ""
+msgstr "Dispozitiv de folosit pentru scanare"
 
 #: ../data/simple-scan.schemas.in.h:2
 msgid "Direction of scan"
-msgstr ""
+msgstr "Direcția scanării"
 
 #: ../data/simple-scan.schemas.in.h:3
 msgid "Directory to save files to"
-msgstr ""
+msgstr "Dosarul în care să se salveze fișierele"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Înălțimea hârtiei în zecimi de mm"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
-msgstr ""
+msgstr "Înălțimea imaginii scanate, în pixeli"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Partea de scanat a paginii"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
-msgstr ""
+msgstr "Rezoluția pentru scanări foto"
 
 #: ../data/simple-scan.schemas.in.h:8
 msgid "Resolution for text scans"
-msgstr ""
+msgstr "Rezoluția pentru scanări text"
 
 #: ../data/simple-scan.schemas.in.h:9
 msgid "Resolution of last scanned image"
-msgstr ""
+msgstr "Rezoluția ultimei imagini scanate"
 
 #: ../data/simple-scan.schemas.in.h:10
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "Dispozitivul SANE din care se preiau imaginile."
 
 #: ../data/simple-scan.schemas.in.h:11
 msgid "TRUE if the application window is maximized"
-msgstr ""
+msgstr "ADEVĂRAT dacă fereastra aplicației este mărită la maximum"
 
 #: ../data/simple-scan.schemas.in.h:12
 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 ""
+"Direcția scanerului peste pagina scanată. Poate fi una dintre următoarele: "
+"„top-to-bottom”, „bottom-to-top”, „left-to-right”, „right-to-left”"
 
 #: ../data/simple-scan.schemas.in.h:13
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Dosarul în care să se salveze fișierele. Dacă nu este definit, fișierele "
+"sunt salvate în dosarul de documente."
 
 #: ../data/simple-scan.schemas.in.h:14
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
+"Înălțimea imaginii scanate, în pixeli. Această valoare este actualizată la "
+"cea corespunzătoare paginii scanate precedent."
 
 #: ../data/simple-scan.schemas.in.h:15
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Înălțimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a "
+"hârtiei)"
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 msgstr ""
+"Partea de scanat a paginii. Poate fi una din următoarele: „ambele”, „față”, "
+"„verso”"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
+msgstr "Rezoluția în dpi (dots-per-inch) a imaginii scanate precedent."
 
 #: ../data/simple-scan.schemas.in.h:18
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea fotografiilor."
 
 #: ../data/simple-scan.schemas.in.h:19
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
+msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea de text."
 
 #: ../data/simple-scan.schemas.in.h:20
 msgid ""
 "The width of scanned image in pixels. This value is updated to what the last "
 "scanned page was."
 msgstr ""
+"Lățimea imaginii scanate, în pixeli. Această valoare este actualizată la cea "
+"corespunzătoare paginii scanate precedent."
 
 #: ../data/simple-scan.schemas.in.h:21
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Lățimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a hârtiei)"
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
-msgstr ""
+msgstr "Tipul de document scanat"
 
 #: ../data/simple-scan.schemas.in.h:23
 msgid ""
@@ -373,27 +386,30 @@ msgid ""
 "photos. This setting decides on the scan resolution, colors and post-"
 "processing."
 msgstr ""
+"Tipul de document scanat. „text” pentru documentele în format text, „photo” "
+"pentru fotografii. Aceste configurări decid rezoluția, culorile și post-"
+"procesarea scanării."
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Lățimea hârtiei în zecimi de mm"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
-msgstr ""
+msgstr "Lățimea imaginii scanate, în pixeli"
 
 #: ../data/simple-scan.schemas.in.h:26
 msgid "Window height in pixels"
-msgstr ""
+msgstr "Înălțimea ferestrei, în pixeli"
 
 #: ../data/simple-scan.schemas.in.h:27
 msgid "Window width in pixels"
-msgstr ""
+msgstr "Lățimea ferestrei, în pixeli"
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.c:889
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Nu există niciun scaner disponibil. Conectați un scaner."
 
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.c:916
@@ -406,19 +422,19 @@ msgid "Unable to start scan"
 msgstr "Nu s-a putut porni scanarea"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1338
+#: ../src/scanner.c:1240 ../src/scanner.c:1346
 msgid "Error communicating with scanner"
 msgstr "Eroare la comunicarea cu scanerul"
 
 #. Title of error dialog when scan failed
 #: ../src/simple-scan.c:265
 msgid "Failed to scan"
-msgstr "Eroare la scanare"
+msgstr "Scanarea a eșuat"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
 #: ../src/simple-scan.c:283
 msgid "Scanned Document"
-msgstr ""
+msgstr "Document scanat"
 
 #. Description on how to use simple-scan displayed on command-line
 #: ../src/simple-scan.c:426
@@ -441,6 +457,12 @@ msgid ""
 "  --help-all                      Show all help options\n"
 "  --help-gtk                      Show GTK+ options"
 msgstr ""
+"Opțiuni de ajutor:\n"
+"  -d, --debug                     Tipărește mesajele de depanare\n"
+"  -v, --version                   Afișează versiunea lansată\n"
+"  -h, --help                      Afișează opțiuni de ajutor\n"
+"  --help-all                      Afișează toate opțiunile de ajutor\n"
+"  --help-gtk                      Afișează opțiuni GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
 #: ../src/simple-scan.c:446
@@ -457,20 +479,20 @@ msgid ""
 "  --g-fatal-warnings              Make all warnings fatal"
 msgstr ""
 "Opțiuni GTK+:\n"
-"  --class=CLASS                   Clasa de program folosită de "
+"  --class=CLASĂ                   Clasa de program folosită de "
 "administratorul de ferestre\n"
-"  --name=NAME                     Nume program folosit de administratorul de "
+"  --name=NUME                     Nume program folosit de administratorul de "
 "ferestre\n"
-"  --screen=SCREEN                 Ecranul X folosit\n"
-"  --sync                          Efectuează apeluri X sincrone\n"
-"  --gtk-module=MODULES            Încarcă module GTK+ adiționale\n"
+"  --screen=ECRAN                  Ecranul X folosit\n"
+"  --sync                          Efectuează X apeluri sincrone\n"
+"  --gtk-module=MODULE             Încarcă module GTK+ adiționale\n"
 "  --g-fatal-warnings              Consideră toate avertismentele fatale"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
 #: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr "Numele de utilizator și parola sunt necesare pentru a accesa „%s”"
+msgstr "Sunt necesare numele de utilizator și parola pentru a accesa „%s”"
 
 #. Warning displayed when no scanners are detected
 #: ../src/ui.c:200
@@ -485,17 +507,17 @@ msgstr "Verificați dacă scanerul este conectat și pornit"
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.c:382
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (document cu mai multe pagini)"
 
 #. Save dialog: Label for saving in JPEG format
 #: ../src/ui.c:384
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (comprimat)"
 
 #. Save dialog: Label for saving in PNG format
 #: ../src/ui.c:386
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (fără pierderi)"
 
 #. Save dialog: Dialog title
 #: ../src/ui.c:398
@@ -505,50 +527,50 @@ msgstr "Salvează ca..."
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.c:414
 msgid "Image Files"
-msgstr ""
+msgstr "Fișiere imagine"
 
 #. Save dialog: Filter name to show all files
 #: ../src/ui.c:421
 msgid "All Files"
-msgstr ""
+msgstr "Toate fișierele"
 
 #. 
 #: ../src/ui.c:426
 msgid "Select File _Type"
-msgstr ""
+msgstr "Alegeți _tipul de fișier"
 
 #. Title of error dialog when save failed
 #: ../src/ui.c:524
 msgid "Failed to save file"
-msgstr "Eroare la salvarea fișierului"
+msgstr "Salvarea fișierului a eșuat"
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:552
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Dacă nu salvați, modificările vor fi pierdute definitiv."
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Salvați documentul curent?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
 msgid "Discard Changes"
-msgstr ""
+msgstr "Renunță la modificări"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:949
+#: ../src/ui.c:950
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Nu s-a putut deschide aplicația de previzualizare a imaginilor"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1245
+#: ../src/ui.c:1246
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Nu se poate deschide fișierul de ajutor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1260
+#: ../src/ui.c:1261
 msgid ""
 "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"
@@ -563,30 +585,33 @@ 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 ""
-"Acest program este liber; îl puteți redistribui și/sau modifica în "
-"conformitate cu termenii Licenței Publice Generale GNU, așa cum este "
-"publicată de către Free Software Foundation; fie versiunea 3 a Licenței, fie "
-"(la latitudinea dumneavoastră) orice versiune ulterioară.\n"
+"Acest program este liber: îl puteți redistribui și/sau modifica în "
+"conformitate cu\n"
+"termenii Licenței Publice Generale GNU, așa cum este publicată de către\n"
+"Free Software Foundation, fie versiunea 3 a Licenței, fie\n"
+"(la alegerea dumneavoastră) orice versiune ulterioară.\n"
 "\n"
-"Acest program este distribuit cu speranța că va fi util, dar FĂRĂ NICI O "
-"GARANȚIE; fără macar garanția implicită de\n"
-"VÂNDABILITATE sau CONFORMITATE UNUI ANUMIT SCOP. A se vedea Licența Publică "
-"Generală GNU pentru detalii.\n"
+"Acest program este distribuit cu speranța că va fi util,\n"
+"dar FĂRĂ NICIO GARANȚIE; nici măcar cu garanția implicită de\n"
+"VANDABILITATE sau CONFORMITATE CU UN ANUMIT SCOP. Consultați\n"
+"Licența Publică Generală GNU pentru mai multe detalii.\n"
 "\n"
-"Ar trebui să fi primit o copie a Licenței Publice Generale GNU împreună cu "
-"acest program. În caz contrar, consultați <http://www.gnu.org/licenses/>."
+"Dumneavoastră ar trebui să fi primit o copie a Licenței Publice Generale "
+"GNU\n"
+"împreună cu acest program. În caz contrar, consultați "
+"<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1274
+#: ../src/ui.c:1275
 msgid "About Simple Scan"
-msgstr "Despre Scanare simplă"
+msgstr "Despre „Scanare simplă”"
 
 #. Description of program
-#: ../src/ui.c:1277
+#: ../src/ui.c:1278
 msgid "Simple document scanning tool"
-msgstr "Utilitar simplu pentru scanare de documente"
+msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: ../src/ui.c:1286
+#: ../src/ui.c:1287
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -597,59 +622,59 @@ msgstr ""
 "  sfantu https://launchpad.net/~sfantus1"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1304
+#: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Salvați documentul înainte de ieșire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1306
+#: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Închide fără a salva"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1448
+#: ../src/ui.c:1449
 #, c-format
 msgid "%d dpi (draft)"
-msgstr ""
+msgstr "%d dpi (ciornă)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
+#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1454
+#: ../src/ui.c:1455
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (rezoluție înaltă)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1477
+#: ../src/ui.c:1478
 #, c-format
 msgid "%d dpi (default)"
-msgstr ""
+msgstr "%d dpi (implicit)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1522
+#: ../src/ui.c:1523
 msgid "Files missing"
 msgstr "Lipsesc fișiere"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1524
+#: ../src/ui.c:1525
 msgid "Please check your installation"
 msgstr "Verificați instalarea"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1581
+#: ../src/ui.c:1582
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Schimbă _scanerul"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1587
+#: ../src/ui.c:1588
 msgid "Automatic"
-msgstr ""
+msgstr "Automată"
 
-#: ../src/ui.c:1865
+#: ../src/ui.c:1866
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
diff --git a/src/book.c b/src/book.c
index 081cbd3..0e33d8b 100644
--- a/src/book.c
+++ b/src/book.c
@@ -439,12 +439,12 @@ book_save_pdf (Book *book, GFile *file, GError **error)
         float page_width, page_height;
 
         page = book_get_page (book, i);
-        width = page_get_width (page);
-        height = page_get_height (page);
-        page_width = width * 72. / page_get_dpi (page);
-        page_height = height * 72. / page_get_dpi (page);
         image = page_get_image (page, TRUE);
+        width = gdk_pixbuf_get_width (image);
+        height = gdk_pixbuf_get_height (image);
         pixels = gdk_pixbuf_get_pixels (image);
+        page_width = width * 72. / page_get_dpi (page);
+        page_height = height * 72. / page_get_dpi (page);
 
         if (page_is_color (page)) {
             int row;