Merge branch 'feature/upstream' into develop

1 files changed, 337 insertions, 286 deletions

diff --git a/po/nb.po b/po/nb.po
index 23eea0c..05af242 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,14 +2,14 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # Kjetil Birkeland Moe <kjetil@skifremme.no>, 2009.
-# Kjartan Maraas <kmaraas@gnome.org>, 2017-2018.
+# Kjartan Maraas <kmaraas@gnome.org>, 2017-2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: simple-scan 3.30.x\n"
+"Project-Id-Version: simple-scan 3.38.x\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-09-02 17:27+0000\n"
-"PO-Revision-Date: 2018-10-09 09:43+0200\n"
+"POT-Creation-Date: 2020-11-25 18:56+0000\n"
+"PO-Revision-Date: 2020-12-01 14:26+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -89,12 +89,12 @@ 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:50
-msgid "Resolution for photo scans"
+msgid "Resolution for image scans"
 msgstr "Oppløsning for bildeskanning"
 
 #: data/org.gnome.SimpleScan.gschema.xml:51
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
+msgid "The resolution in dots-per-inch to use when scanning images."
+msgstr "Oppløsningen i punkter-per-tomme for skanning av bilder."
 
 #: data/org.gnome.SimpleScan.gschema.xml:55
 msgid "Page side to scan"
@@ -113,19 +113,29 @@ 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:65
+msgid "File format that is used for saving image files"
+msgstr "Filformat som brukes for å lagre bildefiler"
+
 #: data/org.gnome.SimpleScan.gschema.xml:66
+msgid ""
+"MIME type that is used for saving image files. Examples of supported MIME "
+"types: image/jpeg, image/png, application/pdf"
+msgstr "MIME-type som brukes til å lagre bildefiler. Eksempler på støttede MIME-typer: image/jpeg, image/png, application/pdf"
+
+#: data/org.gnome.SimpleScan.gschema.xml:71
 msgid "Quality value to use for JPEG compression"
 msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
 
-#: data/org.gnome.SimpleScan.gschema.xml:67
+#: data/org.gnome.SimpleScan.gschema.xml:72
 msgid "Quality value to use for JPEG compression."
 msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
 
-#: data/org.gnome.SimpleScan.gschema.xml:72
+#: data/org.gnome.SimpleScan.gschema.xml:77
 msgid "Delay in millisecond between pages"
 msgstr "Pause mellom sider i millisekunder"
 
-#: data/org.gnome.SimpleScan.gschema.xml:73
+#: data/org.gnome.SimpleScan.gschema.xml:78
 msgid "Delay in millisecond between pages."
 msgstr "Pause i millisekunder mellom sider."
 
@@ -134,244 +144,184 @@ msgstr "Pause i millisekunder mellom sider."
 #. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
 #: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
-#: src/app-window.ui:76 src/app-window.vala:1571
-msgid "Simple Scan"
-msgstr "Simple Scan"
+#: src/app-window.ui:498 src/app-window.vala:1571 src/app-window.vala:1847
+msgid "Document Scanner"
+msgstr "Dokumentskanner"
 
-#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skann dokumenter"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:4
+msgid "Make a digital copy of your photos and documents"
+msgstr "Lage en digital kopi av dine bilder og dokumenter"
 
 #: data/simple-scan.appdata.xml.in:9
 msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"En enkel måte å skanne dokumenter og bilder på. Du kan skjære bort uønskede "
-"deler og rotere bilder hvis de skannes inn feil vei. Skannede elementer kan "
-"skrives ut, eksporteres i pdf-format og lagres i ulike bildeformater."
+"A really easy way to scan both text and images. You can crop out the bad "
+"parts of an image and rotate it if it is the wrong way round. You can print "
+"your scans, export them to pdf, or save them in a range of image formats."
+msgstr "En enkel måte å skanne både tekst og bilder. Du kan skjære bort uønskede deler og rotere bilder hvis de skannes inn feil vei. Skannede elementer kan skrives ut, eksporteres i pdf-format og lagres i ulike bildeformater."
 
 #: data/simple-scan.appdata.xml.in:14
-msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgid "This app uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan bruker rammeverket SANE til å støtte de vanligste skannerne."
 
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentskanner"
+#: data/simple-scan.appdata.xml.in:26
+msgid "The GNOME Project"
+msgstr "GNOME prosjektet"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: data/simple-scan.desktop.in:7
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skan;skanner;planskanner;adf;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: data/simple-scan.desktop.in:10
-msgid "scanner"
-msgstr "scanner"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#. Scan menu item to scan a single page from the scanner
-#. Toolbar scan menu item to scan a single page from the scanner
-#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:831
-msgid "Single _Page"
-msgstr "Enkel _side"
-
-#. Toolbar scan menu item to scan all pages from a document feeder
-#. Scan menu item to scan all pages from a document feeder
-#. Toolbar scan menu item to scan all pages from a document feeder
-#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:840
-msgid "All Pages From _Feeder"
-msgstr "Alle sider fra papirmater"
-
-#. Toolbar scan menu item to scan continuously from the flatbed
-#. Scan menu item to scan continuously from the flatbed
-#. Toolbar scan menu item to scan continuously from the flatbed
-#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:849
-msgid "_Multiple Pages From Flatbed"
-msgstr "_Flere sider fra planskanner"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Tekst"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Bilde"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Dokument"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Sk_ann"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Stopp skanning"
-
-#. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: src/app-window.ui:196 src/app-window.vala:978 src/app-window.vala:1586
-msgid "Reorder Pages"
-msgstr "Omplasser sider"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-post"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Side"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:12
 msgid "Rotate _Left"
 msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:22
 msgid "Rotate _Right"
 msgstr "Roter mot _høyre"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:32
 msgid "_Crop"
 msgstr "_Beskjær"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:42
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:53
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:64
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:75
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:86
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:97
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:108
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:119
 msgid "A_3"
 msgstr "A_4"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:130
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:148
 msgid "_Rotate Crop"
 msgstr "_Roter beskjæringsområdet"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:161
 msgid "Move Left"
 msgstr "Flytt til venstre"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:170
 msgid "Move Right"
 msgstr "Flytt til høyre"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Hjelp"
+#: src/app-window.ui:252
+msgid "_Single Page"
+msgstr "Enkel _side"
 
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Innhold"
+#: src/app-window.ui:303
+msgid "All Pages From _Feeder"
+msgstr "Alle sider fra papirmater"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Skann én enkel side fra skanneren"
+#: src/app-window.ui:354
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Flere sider fra planskanner"
 
-#. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
-msgid "Scan"
-msgstr "Skann"
+#: src/app-window.ui:405
+msgid "_Text"
+msgstr "_Tekst"
 
-#. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
-msgid "Save document to a file"
-msgstr "Lagre dokument til fil"
+#: src/app-window.ui:456
+msgid "_Image"
+msgstr "B_ilde"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Lagre"
+#: src/app-window.ui:476
+msgid "_Preferences"
+msgstr "_Brukervalg"
 
 #. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
+#: src/app-window.ui:516
 msgid "Stop the current scan"
 msgstr "Stopp skanning"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Stopp"
+#: src/app-window.ui:540
+msgid "S_top"
+msgstr "S_topp"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Søker etter skannere …"
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:569
+msgid "Scan a single page from the scanner"
+msgstr "Skann én enkel side fra skanneren"
+
+#: src/app-window.ui:594
+msgid "_Scan"
+msgstr "_Skann"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:697
+msgid "Save document to a file"
+msgstr "Lagre dokument til fil"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:227 src/app-window.vala:1679
 msgid "_Close"
 msgstr "_Lukk"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:236
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Behøver brukernavn og passord for å få tilgang til «%s»"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:253
+msgid "Searching for Scanners…"
+msgstr "Søker etter skannere …"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:261
 msgid "Ready to Scan"
 msgstr "Klar til å skanne"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:270
 msgid "Additional software needed"
 msgstr "Tilleggsprogram må installeres"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:272
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -380,150 +330,170 @@ msgstr ""
 "skanner."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:279
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:281
 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å"
 
+#. Contents of dialog that shows if autosaved book should be loaded.
+#: src/app-window.vala:383
+msgid "An autosaved book exists. Do you want to open it?"
+msgstr "En automatisk lagret bok eksisterer allerede. Vil du åpne den?"
+
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:457
 msgid "Save As…"
 msgstr "Lagre som …"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Avbryt"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:460 src/app-window.vala:756
 msgid "_Save"
 msgstr "_Lagre"
 
-#. Default filename to use when saving document
-#: src/app-window.vala:312
-msgid "Scanned Document.pdf"
-msgstr "Skannet_dokument.pdf"
+#: src/app-window.vala:461 src/app-window.vala:643 src/app-window.vala:755
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. Default filename to use when saving document.
+#. To that filename the extension will be added, eg. "Scanned Document.pdf"
+#: src/app-window.vala:471
+msgid "Scanned Document"
+msgstr "Skannet dokument"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:477
 msgid "Image Files"
 msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:487
 msgid "All Files"
 msgstr "Alle Filer"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:496
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:502
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:508
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:515
 msgid "WebP (compressed)"
 msgstr "WebP (komprimert)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:526
 msgid "File format:"
 msgstr "Filformat:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:549
 msgid "Compression:"
 msgstr "Komprimering:"
 
+#: src/app-window.vala:556
+msgid "Minimum size"
+msgstr "Minste størrelse"
+
+#: src/app-window.vala:560
+msgid "Full detail"
+msgstr "Alle detaljer"
+
 #. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
-#: src/app-window.vala:472
+#: src/app-window.vala:642
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "En fil med navnet «%s» eksisterer allerede. Vil du erstatte den?"
 
 #. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
-#: src/app-window.vala:475
+#: src/app-window.vala:645
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:712
 msgid "Saving"
 msgstr "Lagrer"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:729
 msgid "Failed to save file"
 msgstr "Lagring av fil mislyktes"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:753
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Hvis du ikke lagrer vil endringene gå tapt for alltid."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:789
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:791
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:826
 msgid "Contacting scanner…"
 msgstr "Kontakter _skanner …"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:1095
 msgid "Unable to save image for preview"
 msgstr "Klarte ikke å lagre forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:1107
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:1269
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Endre rekkefølge på sider"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:1292
 msgid "Combine sides"
 msgstr "Kombiner sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1302
 msgid "Combine sides (reverse)"
 msgstr "Kombiner sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1312
 msgid "Reverse"
 msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1322
 msgid "Keep unchanged"
 msgstr "Behold uendret"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1546
 msgid "Unable to open help file"
 msgstr "Klarte ikke å åpne hjelpefil"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1561
 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"
@@ -552,16 +522,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
-msgid "About Simple Scan"
-msgstr "Om Simple Scan"
+#: src/app-window.vala:1564 src/app-window.vala:1880
+msgid "About Document Scanner"
+msgstr "Om Dokumentskanner"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1567
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1576
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -571,25 +541,26 @@ msgstr ""
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  Kåre Birger Lapstuen https://launchpad.net/~lapstue\n"
 "  Mats Taraldsvik https://launchpad.net/~meastp\n"
-"  Åka Sikrom https://launchpad.net/~akrosikam"
+"  Åka Sikrom https://launchpad.net/~akrosikam\n"
+"  Kjartan Maraas <kmaraas@gnome.org>"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1592
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1594
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1635
 msgid "You appear to have a Brother scanner."
 msgstr "Det ser ut som at du har en Brother-skanner."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1637
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -597,32 +568,57 @@ msgstr ""
 "Du skal kunne finne drivere på <a href=\"http://support.brother.com"
 "\">Brothers nettsider</a>."
 
+#. Message to indicate a Canon Pixma scanner has been detected
+#: src/app-window.vala:1641
+msgid ""
+"You appear to have a Canon scanner, which is supported by the <a href="
+"\"http://www.sane-project.org/man/sane-pixma.5.html\">Pixma SANE backend</a>."
+msgstr "Du ser ut til å ha en Canon skanner som støttes av <a href=\"http://www.sane-project.org/man/sane-pixma.5.html\">Pixmap motoren til SANE</a>."
+
+#. Instructions on how to resolve issue with SANE scanner drivers
+#: src/app-window.vala:1643
+msgid ""
+"Please check if your <a href=\"http://www.sane-project.org/sane-supported-"
+"devices.html\">scanner is supported by SANE</a>, otherwise report the issue "
+"to the <a href=\"https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/"
+"sane-devel\">SANE mailing list</a>."
+msgstr "Sjekk om din <a href=\"http://www.sane-project.org/sane-supported-devices.html\">skanner er støttet av SANE</a>, hvis ikke kan du rapportere problemet til <a href=\"https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/sane-devel\">SANE e-postlisten</a>."
+
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1647
 msgid "You appear to have a Samsung scanner."
 msgstr "Det ser ut som at du har en Samsung-skanner."
 
-#. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#. Instructions on how to install Samsung scanner drivers.
+#. Because HP acquired Samsung's global printing business in 2017, the support is made on HP site.
+#: src/app-window.vala:1650
 msgid ""
-"Drivers for this are available on the <a href=\"http://samsung.com/support"
-"\">Samsung website</a>."
-msgstr ""
-"Du skal kunne finne drivere på <a href=\"http://samsung.com/support"
-"\">Samsungs nettsider</a>."
+"Drivers for this are available on the <a href=\"https://support.hp.com\">HP "
+"website</a> (HP acquired Samsung's printing business)."
+msgstr "Drivere er tilgjengelig på <a href=\"https://support.hp.com\">HP's nettsted</a> (HP kjøpte Samsungs utskriftsforretning)."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1655
 msgid "You appear to have an HP scanner."
 msgstr "Det ser ut som at du har en HP-skanner."
 
+#. Instructions on how to install HP scanner drivers.
+#. smfp is rebranded and slightly modified Samsung devices,
+#. for example: HP Laser MFP 135a is rebranded Samsung Xpress SL-M2070.
+#. It require custom drivers, not available in hpaio package
+#: src/app-window.vala:1663
+msgid ""
+"Drivers for this are available on the <a href=\"https://support.hp.com\">HP "
+"website</a>."
+msgstr "Drivere er tilgjengelig på <a href=\"https://support.hp.com\">HP's nettside</a>."
+
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1667
 msgid "You appear to have an Epson scanner."
 msgstr "Det ser ut som at du har en Epson-skanner."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1669
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -630,110 +626,127 @@ msgstr ""
 "Drivere er tilgjengelig på <a href=\"http://support.epson.com\">Epson</a>s "
 "nettside."
 
+#. Message to indicate an Lexmark scanner has been detected
+#: src/app-window.vala:1673
+msgid "You appear to have an Lexmark scanner."
+msgstr "Det ser ut som at du har en Lexmark skanner."
+
+#. Instructions on how to install Lexmark scanner drivers
+#: src/app-window.vala:1675
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.lexmark.com"
+"\">Lexmark website</a>."
+msgstr "Du skal kunne finne drivere på <a href=\"http://support.lexmark.com\">Lexmark's nettsider</a>."
+
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1679
 msgid "Install drivers"
 msgstr "Installer drivere"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
-msgid "Once installed you will need to restart Simple Scan."
+#: src/app-window.vala:1713
+msgid "Once installed you will need to restart this app."
 msgstr "Start Simple Scan på nytt når driveren er installert."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1726
 msgid "Installing drivers…"
 msgstr "Installerer drivere …"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1734
 msgid "Drivers installed successfully!"
 msgstr "Driverne er nå installert."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1744
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Klarte ikke å installere drivere (feilkode %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1750
 msgid "Failed to install drivers."
 msgstr "Klarte ikke å installere drivere."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1757
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Du må installere %s-pakken."
 msgstr[1] "Du må installere %s-pakkene."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1872
 msgid "Email"
 msgstr "E-post"
 
+#: src/app-window.vala:1873
+msgid "Print"
+msgstr "Skriv ut"
+
+#: src/app-window.vala:1874
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Endre rekkefølge på sider"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1875 src/preferences-dialog.ui:44
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1878
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarveier"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1879
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Om"
-
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1600
+#: src/app-window.vala:1888
 msgid "Start Again…"
 msgstr "Start igjen …"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1907
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roter siden til venstre (mot urviseren)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1916
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roter siden til høyre (med urviseren)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1928
 msgid "Crop the selected page"
 msgstr "Beskjær valgt side"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1946
 msgid "Delete the selected page"
 msgstr "Slett valgt side"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:2120
 msgid "Cancel"
 msgstr "A_vbryt"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Autoriser"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Brukernavn for ressurs:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Passord:"
 
@@ -827,168 +840,206 @@ msgctxt "shortcut window"
 msgid "Copy current page to clipboard"
 msgstr "Kopier denne siden til utklippstavlen"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
-msgid "_Scanner"
-msgstr "_Skanner"
+#: src/help-overlay.ui:128
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Generelt"
+
+#: src/help-overlay.ui:133
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Vis hjelp"
+
+#: src/help-overlay.ui:140
+msgctxt "shortcut window"
+msgid "Open menu"
+msgstr "Åpne meny"
+
+#: src/help-overlay.ui:147
+msgctxt "shortcut window"
+msgid "Keyboard shortcuts"
+msgstr "Tastatursnarveier"
+
+#: src/help-overlay.ui:154
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "Avslutt"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
-msgid "Scan Sides"
-msgstr "Skann sider"
+#: src/preferences-dialog.ui:72
+msgid "Scan _Sides"
+msgstr "Skann _sider"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
-msgid "Page Size"
-msgstr "Sidestørrelse"
+#: src/preferences-dialog.ui:88
+msgid "_Page Size"
+msgstr "Sidestør_relse"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:118
 msgid "Front"
 msgstr "Forside"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:128
 msgid "Back"
 msgstr "Bakside"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:138
 msgid "Both"
 msgstr "Begge"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
-msgid "Delay"
-msgstr "Pause"
+#: src/preferences-dialog.ui:165
+msgid "_Delay"
+msgstr "_Pause"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:181
 msgid "Multiple pages from flatbed"
 msgstr "Flere sider fra en planskanner"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:199
 msgid "3"
 msgstr "3"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:310
+#: src/preferences-dialog.ui:209
 msgid "5"
 msgstr "5"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:326
+#: src/preferences-dialog.ui:220
 msgid "7"
 msgstr "7"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:342
+#: src/preferences-dialog.ui:231
 msgid "10"
 msgstr "10"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:358
+#: src/preferences-dialog.ui:242
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:263
 msgid "Seconds"
 msgstr "Sekunder"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
-msgid "Scanning"
-msgstr "Skanning"
+#: src/preferences-dialog.ui:285
+msgid "_Scanning"
+msgstr "_Skanning"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#. Label beside scan resolution combo box
+#: src/preferences-dialog.ui:306
 msgid "_Text Resolution"
 msgstr "_Tekstoppløsning"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
-msgid "_Photo Resolution"
+#. Label beside scan resolution combo box
+#: src/preferences-dialog.ui:322
+msgid "_Image Resolution"
 msgstr "_Bildeoppløsning"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
-msgid "Brightness"
-msgstr "Lysstyrke"
+#: src/preferences-dialog.ui:367
+msgid "_Brightness"
+msgstr "_Lysstyrke"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
-msgid "Contrast"
-msgstr "Kontrast"
+#: src/preferences-dialog.ui:383
+msgid "_Contrast"
+msgstr "_Kontrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
-msgid "Quality"
-msgstr "Kvalitet"
+#: src/preferences-dialog.ui:432
+msgid "_Quality"
+msgstr "_Kvalitet"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:65
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:102
 msgid "Darker"
 msgstr "Mørkere"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:104
 msgid "Lighter"
 msgstr "Lysere"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:112
 msgid "Less"
 msgstr "Mindre"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:114
 msgid "More"
 msgstr "Mer"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:285
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:288
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:291
 #, 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/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:294
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Error displayed when no scanners to scan with
-#: src/scanner.vala:844
+#: src/scanner.vala:870
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ingen skanner tilgjengelig. Koble til en skanner."
 
 #. Error displayed when cannot connect to scanner
-#: src/scanner.vala:874
+#: src/scanner.vala:900
 msgid "Unable to connect to scanner"
 msgstr "Klarte ikke å koble til skanneren"
 
+#. Error displayed when no documents at the start of scanning
+#: src/scanner.vala:1297 src/scanner.vala:1432
+msgid "Document feeder empty"
+msgstr "Dokumentmater er tom"
+
+#. Out of memory error message with help instruction.
+#. Message written in Pango text markup language,
+#. A carriage return makes a line break, <tt> tag makes a monospace font
+#: src/scanner.vala:1305
+msgid ""
+"Insufficient memory to perform scan.\n"
+"Try to decrease <tt>Resolution</tt> or <tt>Page Size</tt> in "
+"<tt>Preferences</tt> menu. For some scanners when scanning in high "
+"resolution, the scan size is restricted."
+msgstr ""
+"Ikke nok minne til å skanne.\n"
+"Prøve mindre <tt>Oppløsning</tt> eller <tt>Sidestørrelse</tt> i <tt>Brukervalg</tt> menyen. Noen skannere begrenser størrelsen når man skanner i høy oppløsning."
+
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1318
 msgid "Unable to start scan"
 msgstr "Klarte ikke å sette i gang skanneren"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1331 src/scanner.vala:1442
 msgid "Error communicating with scanner"
 msgstr "Det oppsto en kommunikasjonsfeil mellom skanneren og datamaskinen"
 
@@ -1003,26 +1054,26 @@ msgid "Print debugging messages"
 msgstr "Vis feilsøkingsmeldinger"
 
 #: src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr "Reparer PDF-filer som er opprettet med eldre versjoner av Simple Scan"
+msgid "Fix PDF files generated with older versions of this app"
+msgstr "Reparer PDF-filer som er opprettet med eldre versjoner av dette programmet"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:393
+#: src/simple-scan.vala:1755
 msgid "Failed to scan"
 msgstr "Klarte ikke å utføre skanningen"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:408
+#: src/simple-scan.vala:1770
 msgid "Scan in progress"
 msgstr "Skanning pågår"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:585
+#: src/simple-scan.vala:1954
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[ENHET …] – Scanneutstyr"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:596
+#: src/simple-scan.vala:1965
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""