Merge tag 'upstream/3.12.0'

Upstream version 3.12.0

1 files changed, 213 insertions, 215 deletions

diff --git a/po/nb.po b/po/nb.po
index 4eeace6..43c6fd2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.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: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autoriser"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Brukernavn for ressurs:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Passord:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Tekst"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Bilde"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "For- og bakside"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Forside"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Bakside"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_ann"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Enkel _side"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra papirmater"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Stopp skanning"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Tekst"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Bilde"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Roter mot _høyre"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Beskjær"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Roter beskjæringsområdet"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Innhold"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Begynn et nytt dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Ny"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Skann én enkel side fra skanneren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skann"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Lagre"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Stopp skanning"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Stopp"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roter siden til venstre (mot urviseren)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Roter mot venstre"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roter siden til høyre (med urviseren)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Roter mot høyre"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Beskjær valgt side"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Beskjær"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Brukernavn for ressurs:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Passord:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autoriser"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Innstillinger"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Hent fra:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Tekstoppløsning"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Bildeoppløsning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Skann side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Sidestørrelse:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Lysstyrke:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Kvalitet:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "For- og bakside"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Forside"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Bakside"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Skann dokumenter"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Vindusbredde i pixler"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Vindushøyde i pixler"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "SANN hvis programvinduet er maksimert"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Enhet det skal skannes fra"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE-enhet som bilder skal hentes fra."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Dokumenttype som skannes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,143 +311,104 @@ msgstr ""
 "Dokumenttype som skal scannes. Denne innstillingen endrer oppløsning, farger "
 "og etterbehandling."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Skanneretning"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Retningen til scanneren over den scannede siden."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Bredde på skannet bilde, i pixler"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-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/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Høyde på skannede bilder, i pixler"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-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/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Papirbredde i tiendels millimeter"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Papirbredden i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Papirhøyde i tiendels millimeter"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Papirhøyde i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Skanningens ysstyrke"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Justering av lysstyrke fra -100 til 100 (0 betyr ingen lys)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Skanningens kontrastforsterkning"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 "Justering av kontrast fra -100 til 100 (en verdi på 0 gir ingen "
 "forsterkning)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Oppløsning på sist skannede bilde"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Oppløsning i punkter-per-tomme til sist utførte skanning."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Oppløsning for tekstskanning"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Oppløsning for bildeskanning"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Side som skal skannes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Siden som skal scannes."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Lagre filer i mappe"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ingen skanner tilgjengelig. Vennligst koble til en skanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Klarte ikke å koble til skanneren"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Klarte ikke å sette i gang skanneren"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Det oppsto en kommunikasjonsfeil mellom skanneren og datamaskinen"
 
@@ -500,98 +449,110 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kjør «%s --help» for å se en full liste over tilgjengelige kommandolinjevalg."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Lukk"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Behøver brukernavn og passord for å få tilgang til '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Lagre som..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Lagre"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Alle Filer"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Velg fil_type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Lagring av fil mislyktes"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke lagrer vil endringene gå tapt."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Kunne ikke lagre forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Kan ikke åpne hjelpfil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 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"
@@ -620,16 +581,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -641,98 +602,104 @@ msgstr ""
 "  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høy oppløsning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Manglende filer"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Vennligst undersøk installasjonen"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Bytt _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Lagrer dokument …"
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Lagrer side nr. %d av %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Høyde på skannede bilder, i pixler"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Skanneretning"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Oppløsning på sist skannede bilde"
+
 #~ 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'"
@@ -749,6 +716,34 @@ msgstr "Lagrer side nr. %d av %d"
 #~ "Denne innstillinger bestemmer oppløsning, farger og etterbehandling for "
 #~ "skanningen."
 
+#~ 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."
+
+#~ 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."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "SANN hvis programvinduet er maksimert"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Oppløsning i punkter-per-tomme til sist utførte skanning."
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Vindushøyde i pixler"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Vindusbredde i pixler"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Bredde på skannet bilde, i pixler"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -800,3 +795,6 @@ msgstr "Lagrer side nr. %d av %d"
 #~ msgstr ""
 #~ "Siden som skal skannes. Det kan være én av følgende: 'begge' 'forside' "
 #~ "'bakside'"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Retningen til scanneren over den scannede siden."