Merge branch 'feature/upstream' into develop

90 files changed, 10413 insertions, 9978 deletions

diff --git a/NEWS b/NEWS
index 6af9081..3a8c6d4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,54 @@
-Overview of changes in simple-scan 3.30.2
+Overview of changes in simple-scan 3.32.2
+
+  * New application icon
+
+Overview of changes in simple-scan 3.32.1
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.32.0
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.31.92
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.31.91
+
+  * Fix save overwriting existing file when user decided not to.
+  * Make save button insensitive while saving
+
+Overview of changes in simple-scan 3.31.90.1
+
+  * Fix crash when detecting scanners
+
+Overview of changes in simple-scan 3.31.90
+
+  * Support non-standard Epson ADF scanner options
+
+Overview of changes in simple-scan 3.31.4
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.31.3
 
   * Updated translations
 
-Overview of changes in simple-scan 3.30.1.1
+Overview of changes in simple-scan 3.31.2
 
-  * Rebuild tarball as 3.30 releases have out of date content
+  * Use Gtk.FileChooserNative for save dialog so works in sandboxed environments
+  * Use GLib.List.deep_copy() to fix type-argument mismatch
 
-Overview of changes in simple-scan 3.30.1
+Overview of changes in simple-scan 3.31.1
 
+  * Replace scan menu with a popdown
+  * Make ActionBar buttons wide to match design
+  * Drop legacy toolbar support
   * Update homepage from Launchpad to gitlab.gnome.org
+  * Remove some GTK+ code that isn't present in GTK+ 4
+  * Update About menu item to new standard name
+  * Make about dialog app name translatable
 
 Overview of changes in simple-scan 3.30.0
 
diff --git a/data/icons/16x16/object-crop.png b/data/icons/16x16/object-crop.png
deleted file mode 100644
index 48bcd12..0000000
--- a/data/icons/16x16/object-crop.png
+++ /dev/null
diff --git a/data/icons/22x22/object-crop.png b/data/icons/22x22/object-crop.png
deleted file mode 100644
index 4dedd93..0000000
--- a/data/icons/22x22/object-crop.png
+++ /dev/null
diff --git a/data/icons/24x24/object-crop.png b/data/icons/24x24/object-crop.png
deleted file mode 100644
index 0e46708..0000000
--- a/data/icons/24x24/object-crop.png
+++ /dev/null
diff --git a/data/icons/32x32/object-crop.png b/data/icons/32x32/object-crop.png
deleted file mode 100644
index b169fb7..0000000
--- a/data/icons/32x32/object-crop.png
+++ /dev/null
diff --git a/data/icons/48x48/object-crop.png b/data/icons/48x48/object-crop.png
deleted file mode 100644
index e410183..0000000
--- a/data/icons/48x48/object-crop.png
+++ /dev/null
diff --git a/data/icons/hicolor/scalable/org.gnome.SimpleScan.svg b/data/icons/hicolor/scalable/org.gnome.SimpleScan.svg
new file mode 100644
index 0000000..9616b55
--- /dev/null
+++ b/data/icons/hicolor/scalable/org.gnome.SimpleScan.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" version="1.0" enable-background="new"><defs><linearGradient xlink:href="#a" id="n" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-.25 0 0 .25 166 125.009)" x1="248" y1="619.964" x2="568" y2="619.964"/><linearGradient id="a"><stop offset="0" stop-color="#d5d3cf"/><stop offset=".05" stop-color="#e4e1de"/><stop offset=".1" stop-color="#d5d3cf"/><stop offset=".9" stop-color="#d5d3cf"/><stop offset=".95" stop-color="#e4e1de"/><stop offset="1" stop-color="#d5d3cf"/></linearGradient><clipPath clipPathUnits="userSpaceOnUse" id="l"><rect style="marker:none" width="400" height="256" x="56" y="-92" rx="8" ry="8" fill="none" stroke="#000" stroke-width="4" enable-background="new"/></clipPath><filter id="m" x="-.264" width="1.528" y="-.014" height="1.028" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="1.76"/></filter><radialGradient xlink:href="#b" id="k" cx="-72.632" cy="88.045" fx="-72.632" fy="88.045" r="200" gradientTransform="matrix(.08386 0 0 2.375 230.091 -273.105)" gradientUnits="userSpaceOnUse"/><linearGradient id="b"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#d5d3cf" stop-opacity="0"/></linearGradient><linearGradient gradientTransform="matrix(.25 0 0 .29687 225 12)" xlink:href="#c" id="j" x1="-156" y1="-256" x2="220" y2="-256" gradientUnits="userSpaceOnUse"/><linearGradient id="c"><stop offset="0"/><stop offset="1" stop-color="#424048"/></linearGradient><linearGradient gradientTransform="matrix(.25 0 0 .275 232.467 16.3)" xlink:href="#d" id="i" x1="-122.894" y1="-292" x2="34.97" y2="-292" gradientUnits="userSpaceOnUse"/><linearGradient id="d"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#f6f5f4"/></linearGradient><linearGradient id="h"><stop stop-color="#fff" offset="0"/><stop stop-opacity="0" stop-color="#fff" offset="1"/></linearGradient><linearGradient id="e"><stop stop-color="#f6f5f4" offset="0"/><stop stop-color="#fff" offset="1"/></linearGradient><linearGradient id="f"><stop stop-color="#d5d3cf" offset="0"/><stop stop-color="#e4e1de" offset=".05"/><stop stop-color="#d5d3cf" offset=".1"/><stop stop-color="#d5d3cf" offset=".9"/><stop stop-color="#e4e1de" offset=".95"/><stop stop-color="#d5d3cf" offset="1"/></linearGradient><linearGradient id="g"><stop stop-color="#d5d3cf" offset="0"/><stop stop-color="#e4e1de" offset=".02"/><stop stop-color="#d5d3cf" offset=".059"/><stop stop-color="#d5d3cf" offset=".945"/><stop stop-color="#e4e1de" offset=".973"/><stop stop-color="#d5d3cf" offset="1"/></linearGradient></defs><g transform="translate(0 -172)"><rect transform="rotate(90)" ry="8.8" rx="8" y="-108" x="180" height="88" width="110" style="marker:none" fill="url(#i)" enable-background="new"/><rect transform="rotate(90)" ry="0" rx="0" y="-102" x="186" height="76" width="94" style="marker:none" fill="url(#j)" enable-background="new"/><rect transform="rotate(90)" ry="0" rx="0" y="-102" x="186" height="76" width="94" style="marker:none" opacity=".486" fill="url(#k)" enable-background="new"/><g transform="matrix(0 .25 -.29687 0 74.688 132)" clip-path="url(#l)" fill="#fff" stroke="none" color="#000" font-weight="400" font-family="sans-serif"><path transform="matrix(1.33333 0 0 1 -144 0)" d="M372-116v304h24v-304z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" overflow="visible" fill="#f9f06b" filter="url(#m)" enable-background="new"/><path d="M360-116v304h16v-304z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" overflow="visible" enable-background="accumulate"/></g><path style="marker:none" d="M108 280v4c0 4.432-3.568 8-8 8H28c-4.432 0-8-3.568-8-8v-4c0 4.432 3.568 8 8 8h72c4.432 0 8-3.568 8-8z" fill="url(#n)" enable-background="new"/><g stroke-width="1.376"><path d="M37.815 191.985h36.096l22.088 21.748.001 54.585c0 3.221-2.626 5.831-5.847 5.831H37.815A5.803 5.803 0 0 1 32 268.334V197.8a5.803 5.803 0 0 1 5.815-5.816z" fill="#f6f5f4" enable-background="new"/><path d="M74.036 192.235v15.992c0 3.222 2.624 5.76 5.846 5.76l15.992-.004z" fill="#deddda" enable-background="new"/></g></g></svg>
\ No newline at end of file
diff --git a/data/icons/hicolor/symbolic/org.gnome.SimpleScan-symbolic.svg b/data/icons/hicolor/symbolic/org.gnome.SimpleScan-symbolic.svg
new file mode 100644
index 0000000..e18b812
--- /dev/null
+++ b/data/icons/hicolor/symbolic/org.gnome.SimpleScan-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.0"><defs><linearGradient id="d"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#d5d3cf" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0"/><stop offset="1" stop-color="#424048"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#f6f5f4"/></linearGradient><linearGradient id="g"><stop stop-color="#fff" offset="0"/><stop stop-opacity="0" stop-color="#fff" offset="1"/></linearGradient><linearGradient id="a"><stop stop-color="#f6f5f4" offset="0"/><stop stop-color="#fff" offset="1"/></linearGradient><linearGradient id="b"><stop stop-color="#d5d3cf" offset="0"/><stop stop-color="#e4e1de" offset=".05"/><stop stop-color="#d5d3cf" offset=".1"/><stop stop-color="#d5d3cf" offset=".9"/><stop stop-color="#e4e1de" offset=".95"/><stop stop-color="#d5d3cf" offset="1"/></linearGradient><linearGradient id="c"><stop stop-color="#d5d3cf" offset="0"/><stop stop-color="#e4e1de" offset=".02"/><stop stop-color="#d5d3cf" offset=".059"/><stop stop-color="#d5d3cf" offset=".945"/><stop stop-color="#e4e1de" offset=".973"/><stop stop-color="#d5d3cf" offset="1"/></linearGradient></defs><g transform="translate(-160 -172)"><rect style="marker:none" width="12" height="12" x="162" y="174" rx="1.661" ry="1.661" fill="none" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path style="marker:none" d="M163 179.645h11" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/><path style="marker:none" d="M165 176v8h6v-6l-2-2z"/></g></svg>
\ No newline at end of file
diff --git a/data/icons/scalable/object-crop.svg b/data/icons/scalable/object-crop.svg
deleted file mode 100644
index 42c4605..0000000
--- a/data/icons/scalable/object-crop.svg
+++ /dev/null
@@ -1,826 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/andreas/projekt/bild/tango/scalable/draw-pencil3.png"
-   width="48px"
-   height="48px"
-   id="svg9121"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-art-libre/scalable/transformations"
-   sodipodi:docname="transform-crop-and-resize.svg">
-  <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2309">
-      <stop
-         style="stop-color:#686b65;stop-opacity:1;"
-         offset="0"
-         id="stop2311" />
-      <stop
-         style="stop-color:#686b65;stop-opacity:0;"
-         offset="1"
-         id="stop2313" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2301">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2303" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2305" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2287">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2289" />
-      <stop
-         style="stop-color:#cdcdcd;stop-opacity:0.77319586;"
-         offset="1"
-         id="stop2291" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2224">
-      <stop
-         style="stop-color:#32342f;stop-opacity:0.54639173;"
-         offset="0.0000000"
-         id="stop2226" />
-      <stop
-         style="stop-color:#32342f;stop-opacity:0;"
-         offset="1"
-         id="stop2228" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2224"
-       id="radialGradient2230"
-       cx="24.041630"
-       cy="42.242130"
-       fx="24.041630"
-       fy="42.242130"
-       r="17.576654"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.304598,1.552820e-15,29.37527)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3441">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop3443" />
-      <stop
-         style="stop-color:#fcfff6;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2655">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2657" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop2659" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6157">
-      <stop
-         id="stop6159"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         id="stop6165"
-         offset="0.50000000"
-         style="stop-color:#dfe2da;stop-opacity:1.0000000;" />
-      <stop
-         id="stop6161"
-         offset="1.0000000"
-         style="stop-color:#babdb6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10677">
-      <stop
-         style="stop-color:#6f4501;stop-opacity:1;"
-         offset="0"
-         id="stop10679" />
-      <stop
-         style="stop-color:#6f4501;stop-opacity:0;"
-         offset="1"
-         id="stop10681" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8391">
-      <stop
-         style="stop-color:#8f5902;stop-opacity:1;"
-         offset="0"
-         id="stop8393" />
-      <stop
-         style="stop-color:#8f5902;stop-opacity:0;"
-         offset="1"
-         id="stop8395" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7625">
-      <stop
-         style="stop-color:#505b5f;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop7627" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop7629" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5333">
-      <stop
-         style="stop-color:#555753;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop5335" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop5341" />
-      <stop
-         style="stop-color:#555753;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop5337" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5325">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop5327" />
-      <stop
-         style="stop-color:#555753;stop-opacity:0;"
-         offset="1"
-         id="stop5329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5229">
-      <stop
-         id="stop5231"
-         offset="0.0000000"
-         style="stop-color:#969993;stop-opacity:1.0000000;" />
-      <stop
-         id="stop5237"
-         offset="0.50000000"
-         style="stop-color:#d4d8d0;stop-opacity:1.0000000;" />
-      <stop
-         id="stop5233"
-         offset="1.0000000"
-         style="stop-color:#abaea7;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11940">
-      <stop
-         id="stop11942"
-         offset="0"
-         style="stop-color:#fcf18f;stop-opacity:1;" />
-      <stop
-         id="stop11944"
-         offset="1"
-         style="stop-color:#fcf18f;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11932">
-      <stop
-         id="stop11934"
-         offset="0"
-         style="stop-color:#b59300;stop-opacity:1;" />
-      <stop
-         id="stop11936"
-         offset="1"
-         style="stop-color:#b59300;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11924"
-       inkscape:collect="always">
-      <stop
-         id="stop11926"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop11928"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11916">
-      <stop
-         id="stop11918"
-         offset="0.0000000"
-         style="stop-color:#8b7200;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11920"
-         offset="1"
-         style="stop-color:#544500;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11124">
-      <stop
-         id="stop11126"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11128"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19124">
-      <stop
-         style="stop-color:#fcf18f;stop-opacity:1;"
-         offset="0"
-         id="stop19126" />
-      <stop
-         style="stop-color:#fcf8ce;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop19128" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19116">
-      <stop
-         style="stop-color:#987c00;stop-opacity:1;"
-         offset="0"
-         id="stop19118" />
-      <stop
-         style="stop-color:#5f4d00;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop19120" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19108">
-      <stop
-         style="stop-color:#edd400;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop19110" />
-      <stop
-         style="stop-color:#b8a500;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop19112" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18320">
-      <stop
-         style="stop-color:#e9b96e;stop-opacity:1;"
-         offset="0"
-         id="stop18322" />
-      <stop
-         style="stop-color:#b88433;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop18324" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14520">
-      <stop
-         style="stop-color:#fcfae2;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop14522" />
-      <stop
-         style="stop-color:#b8ab27;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop14524" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14520"
-       id="linearGradient14526"
-       gradientTransform="scale(0.831950,1.201995)"
-       x1="23.411154"
-       y1="0.82209921"
-       x2="21.684671"
-       y2="6.4114828"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18320"
-       id="linearGradient18326"
-       gradientTransform="matrix(1.228073,0.000000,0.000000,1.407676,-1.888866,-14.16649)"
-       x1="11.711685"
-       y1="31.134253"
-       x2="15.543560"
-       y2="33.482140"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19108"
-       id="linearGradient19114"
-       gradientTransform="scale(0.827650,1.208240)"
-       x1="31.654196"
-       y1="3.4796145"
-       x2="28.394352"
-       y2="12.564109"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="29.502863"
-       x2="24.769884"
-       y1="11.246989"
-       x1="15.750742"
-       gradientTransform="matrix(0.831950,0.000000,0.000000,1.201995,100.1096,-33.10918)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11152"
-       xlink:href="#linearGradient14520"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="33.482140"
-       x2="15.543560"
-       y1="31.134253"
-       x1="11.711685"
-       gradientTransform="matrix(0.934030,0.000000,0.000000,1.070630,100.1096,-33.10918)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11154"
-       xlink:href="#linearGradient18320"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="19.211454"
-       x2="29.475761"
-       y1="13.215685"
-       x1="20.190006"
-       gradientTransform="matrix(0.827650,0.000000,0.000000,1.208240,100.1096,-33.10918)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11156"
-       xlink:href="#linearGradient19108"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="4.8820314"
-       x2="33.964863"
-       y1="35.224327"
-       x1="8.1650734"
-       gradientTransform="scale(0.824694,1.212571)"
-       id="linearGradient11930"
-       xlink:href="#linearGradient11924"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="2.7806931"
-       x2="34.060062"
-       y1="16.266647"
-       x1="27.062229"
-       gradientTransform="scale(0.800741,1.248844)"
-       id="linearGradient11938"
-       xlink:href="#linearGradient11932"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="-0.48521933"
-       x2="16.707243"
-       y1="4.4311285"
-       x1="14.394565"
-       gradientTransform="scale(0.838071,1.193216)"
-       id="linearGradient11946"
-       xlink:href="#linearGradient11940"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="4.8820314"
-       x2="33.964863"
-       y1="35.224327"
-       x1="8.1650734"
-       gradientTransform="matrix(0.824694,0.000000,0.000000,1.212571,17.09202,-2.523485)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13466"
-       xlink:href="#linearGradient11924"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2.6501136"
-       x2="24.141811"
-       y1="7.2559285"
-       x1="22.480724"
-       gradientTransform="scale(0.826560,1.209833)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13472"
-       xlink:href="#linearGradient11916"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="12.564109"
-       x2="28.394352"
-       y1="3.4796145"
-       x1="31.654196"
-       gradientTransform="scale(0.827650,1.208240)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1949"
-       xlink:href="#linearGradient19108"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="33.482140"
-       x2="15.543560"
-       y1="31.134253"
-       x1="11.711685"
-       gradientTransform="matrix(1.228073,4.302344e-17,-4.316300e-17,1.407676,-1.888866,-14.16649)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1951"
-       xlink:href="#linearGradient18320"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-0.48521933"
-       x2="16.707243"
-       y1="4.4311285"
-       x1="14.394565"
-       gradientTransform="scale(0.838071,1.193216)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1953"
-       xlink:href="#linearGradient11940"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2.7806931"
-       x2="34.060062"
-       y1="16.266647"
-       x1="27.062229"
-       gradientTransform="scale(0.800741,1.248844)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1955"
-       xlink:href="#linearGradient11932"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="6.4114828"
-       x2="21.684671"
-       y1="0.82209921"
-       x1="23.411154"
-       gradientTransform="scale(0.831950,1.201995)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1957"
-       xlink:href="#linearGradient14520"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2.6501136"
-       x2="24.141811"
-       y1="7.2559285"
-       x1="22.480724"
-       gradientTransform="scale(0.826560,1.209833)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1959"
-       xlink:href="#linearGradient11916"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11916"
-       id="linearGradient4295"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.810222,0.163528,-0.239356,1.185920,0.000000,0.000000)"
-       x1="32.368496"
-       y1="6.0591717"
-       x2="35.239323"
-       y2="-3.6642039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14520"
-       id="linearGradient4300"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.815505,0.164595,-0.237805,1.178235,8.297767,0.197690)"
-       x1="23.411154"
-       y1="0.82209921"
-       x2="21.684671"
-       y2="6.4114828" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11932"
-       id="linearGradient4303"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.784913,0.158420,-0.247074,1.224159,0.000000,0.000000)"
-       x1="43.604591"
-       y1="9.6609612"
-       x2="48.134148"
-       y2="1.5751816" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11940"
-       id="linearGradient4306"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.821506,0.165806,-0.236068,1.169631,0.000000,0.000000)"
-       x1="28.250944"
-       y1="1.5502936"
-       x2="29.906208"
-       y2="-2.3372657" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18320"
-       id="linearGradient4309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.203798,0.242964,-0.278497,1.379850,9.248965,-14.06247)"
-       x1="11.711685"
-       y1="31.134253"
-       x2="15.543560"
-       y2="33.482140" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19108"
-       id="linearGradient4312"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.811291,0.163744,-0.239041,1.184358,0.000000,0.000000)"
-       x1="41.323280"
-       y1="-3.1978326"
-       x2="38.269123"
-       y2="11.365776" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5229"
-       id="linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.821255,0.715182,-0.603048,0.692490,0.000000,0.000000)"
-       x1="24.742752"
-       y1="2.3111212"
-       x2="31.589277"
-       y2="2.4383495" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5333"
-       id="linearGradient5339"
-       gradientTransform="scale(1.064121,0.939743)"
-       x1="21.868711"
-       y1="15.557981"
-       x2="30.635437"
-       y2="24.778368"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5333"
-       id="linearGradient6107"
-       gradientTransform="scale(1.061798,0.941799)"
-       x1="15.356030"
-       y1="27.317253"
-       x2="20.829000"
-       y2="33.497402"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7625"
-       id="radialGradient7631"
-       gradientTransform="matrix(1.130280,0.000000,0.000000,0.884737,0.902354,-0.427463)"
-       cx="8.9124269"
-       cy="34.747555"
-       fx="9.0367527"
-       fy="34.482697"
-       r="7.9984083"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8391"
-       id="linearGradient8397"
-       gradientTransform="scale(1.013347,0.986829)"
-       x1="32.138252"
-       y1="14.785198"
-       x2="38.881176"
-       y2="6.9174280"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10677"
-       id="linearGradient10683"
-       gradientTransform="scale(0.941920,1.061662)"
-       x1="32.457001"
-       y1="16.203007"
-       x2="41.377167"
-       y2="5.4044285"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10677"
-       id="linearGradient10685"
-       gradientTransform="scale(0.941920,1.061662)"
-       x1="32.457001"
-       y1="16.203007"
-       x2="41.377167"
-       y2="5.4044285"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="7.8440785"
-       x2="-38.256573"
-       y1="17.157629"
-       x1="-31.074017"
-       gradientTransform="scale(0.765250,1.306762)"
-       id="linearGradient6163"
-       xlink:href="#linearGradient6157"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="7.8440785"
-       x2="-38.256573"
-       y1="17.157629"
-       x1="-31.074017"
-       gradientTransform="matrix(0.603485,0.470548,-0.803519,1.030527,48.59133,29.97432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7714"
-       xlink:href="#linearGradient6157"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2655"
-       id="linearGradient2661"
-       gradientTransform="scale(0.954299,1.047890)"
-       x1="34.563408"
-       y1="12.489259"
-       x2="40.103199"
-       y2="5.6996894"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3441"
-       id="linearGradient3452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.527682,3.007844e-9,-1.465781e-8,1.395766,0.274469,-0.380594)"
-       x1="54.225159"
-       y1="-3.4504862"
-       x2="64.746307"
-       y2="-2.537426" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2287"
-       id="linearGradient2293"
-       x1="17.66604"
-       y1="30.501617"
-       x2="19.180296"
-       y2="22.001617"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2224"
-       id="radialGradient2297"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.304598,2.474554e-15,29.37527)"
-       cx="24.041630"
-       cy="42.242130"
-       fx="24.041630"
-       fy="42.242130"
-       r="17.576654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2301"
-       id="linearGradient2307"
-       x1="25.728207"
-       y1="12.759781"
-       x2="27.500931"
-       y2="14.134781"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.902575,0.000000,0.000000,0.902575,2.604411,1.752083)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2309"
-       id="linearGradient2315"
-       x1="32.983826"
-       y1="13.087369"
-       x2="38.270443"
-       y2="5.9726477"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.22745098"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="30.522044"
-     inkscape:cy="36.26787"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="915"
-     inkscape:window-height="852"
-     inkscape:window-x="365"
-     inkscape:window-y="58"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Crop Tool</dc:title>
-        <dc:date>2005-10-12</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>crop</rdf:li>
-            <rdf:li>cut</rdf:li>
-            <rdf:li>divide</rdf:li>
-            <rdf:li>split</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.48295455;fill:url(#radialGradient2230);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.07686412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2222"
-       sodipodi:cx="24.04163"
-       sodipodi:cy="42.24213"
-       sodipodi:rx="17.576654"
-       sodipodi:ry="5.3538084"
-       d="M 41.618284 42.24213 A 17.576654 5.3538084 0 1 1  6.4649754,42.24213 A 17.576654 5.3538084 0 1 1  41.618284 42.24213 z"
-       transform="matrix(0.673638,0.000000,0.000000,0.430086,-0.605052,20.90465)" />
-    <path
-       sodipodi:nodetypes="cccccc"
-       id="path7706"
-       d="M 2.8839231,40.604807 C 2.8289019,40.675373 16.747691,40.499044 28.467196,32.686242 L 25.880399,30.669273 L 28.874256,26.8296 L 19.439728,19.473343 L 2.8839231,40.604807 z "
-       style="fill:url(#linearGradient7714);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#686b65;stroke-width:1.0000007;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    <path
-       sodipodi:nodetypes="cccccc"
-       id="path7708"
-       d="M 5.4018936,39.015942 C 9.8468723,38.336507 18.489609,36.512606 26.767934,32.643585 L 24.476866,30.857202 L 29.930295,23.863084 L 22.072991,17.736614 L 5.4018936,39.015942 z "
-       style="stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-linejoin:miter;stroke-linecap:butt;stroke-width:1.0000007;stroke:url(#linearGradient2293);fill-rule:evenodd;fill-opacity:1.0000000;fill:none" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path7710"
-       d="M 25.184875,30.813965 C 16.717482,37.347736 5.8763072,37.531471 5.9121195,37.508799 L 4.1515976,39.859872 C 4.1959591,39.943637 16.629555,39.727546 27.636682,32.738124 L 25.184875,30.813965 z "
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
-    <path
-       sodipodi:nodetypes="cccccc"
-       id="path7712"
-       d="M 33.128941,0.021384731 L 18.603207,18.650892 C 21.372977,21.055374 22.372377,22.637098 20.25171,25.552907 L 23.708442,28.248177 C 25.447618,25.865954 27.221201,25.210765 30.296105,27.96658 L 45.12593,9.5458368"
-       style="fill:url(#linearGradient2661);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2315);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;opacity:1;color:#000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="fill:#eeeeec;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient3452);stroke-width:1.0000583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
-       id="rect3450"
-       width="4.5955172"
-       height="14.063637"
-       x="31.493130"
-       y="-11.785673"
-       rx="1.6161331"
-       ry="1.4138852"
-       transform="matrix(0.794294,0.607534,-0.619919,0.784665,0.000000,0.000000)" />
-    <path
-       transform="matrix(1.281689,0.000000,0.000000,1.098472,-7.036086,-7.532814)"
-       d="M 41.618284 42.24213 A 17.576654 5.3538084 0 1 1  6.4649754,42.24213 A 17.576654 5.3538084 0 1 1  41.618284 42.24213 z"
-       sodipodi:ry="5.3538084"
-       sodipodi:rx="17.576654"
-       sodipodi:cy="42.24213"
-       sodipodi:cx="24.04163"
-       id="path2295"
-       style="opacity:0.32954544;fill:url(#radialGradient2297);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.07686412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient2307);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 32.505759,1.7713847 L 19.395197,18.585909 C 21.895122,20.756134 22.797155,22.183758 20.883095,24.815494 L 24.003054,27.248177 C 25.57279,25.098042 27.173582,24.506685 29.948913,26.994015 L 43.33394,10.367915"
-       id="path2299"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       style="opacity:0.48295456;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 43.125,11 L 30.25,27.25 C 27.25,25.5 26.375,24.75 23.625,27.5 L 20.875,25.375 L 23.625,26.5 C 25.875,24.375 27.625,24.25 29.75,26.375 L 43.125,11 z "
-       id="path2317"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       style="opacity:0.11363636;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 20,26.0625 L 23.6875,30.25 C 26.0625,26.875 26.75,27.3125 27.625,27.5625 L 28.1875,27.0625 C 26.6875,26.25 25.25,26.6875 23.75,28.875 L 20,26.0625 z "
-       id="path2319"
-       sodipodi:nodetypes="cccccc" />
-  </g>
-</svg>
diff --git a/data/meson.build b/data/meson.build
index 9bba15f..aa1d0ec 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,11 +1,8 @@
-foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48', 'scalable' ]
-    suffix = 'png'
-    if size == 'scalable'
-        suffix = 'svg'
-    endif
-    install_data (join_paths ('icons', size , 'object-crop.' + suffix),
-                  install_dir: join_paths (icondir, 'hicolor', size, 'actions'))
-endforeach
+install_data (join_paths ('icons', 'hicolor', 'scalable', '@0@.svg'.format(app_id)),
+              install_dir: join_paths (datadir, 'icons', 'hicolor', 'scalable', 'apps'))
+
+install_data (join_paths ('icons', 'hicolor', 'symbolic', '@0@-symbolic.svg'.format(app_id)),
+              install_dir: join_paths (datadir, 'icons', 'hicolor', 'symbolic', 'apps'))
 
 install_data ('org.gnome.SimpleScan.gschema.xml',
               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
diff --git a/data/simple-scan.desktop.in b/data/simple-scan.desktop.in
index 98deb0d..2e602af 100644
--- a/data/simple-scan.desktop.in
+++ b/data/simple-scan.desktop.in
@@ -6,7 +6,7 @@ Comment=Scan Documents
 Keywords=scan;scanner;flatbed;adf;
 Exec=simple-scan
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=scanner
+Icon=org.gnome.SimpleScan
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/help/C/figures/icon.png b/help/C/figures/icon.png
index 8cfefc1..639c55f 100644
--- a/help/C/figures/icon.png
+++ b/help/C/figures/icon.png
diff --git a/help/C/figures/preferences.png b/help/C/figures/preferences.png
index fe3bbe1..edfd164 100644
--- a/help/C/figures/preferences.png
+++ b/help/C/figures/preferences.png
diff --git a/help/C/figures/scan_toolbar.png b/help/C/figures/scan_toolbar.png
index 7736d68..d4d4ab8 100644
--- a/help/C/figures/scan_toolbar.png
+++ b/help/C/figures/scan_toolbar.png
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 5673e18..a5656a5 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"POT-Creation-Date: 2017-10-21 12:34+0000\n"
+"POT-Creation-Date: 2019-03-09 13:11+0000\n"
 "PO-Revision-Date: 2017-10-29 21:55+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
@@ -83,10 +83,10 @@ msgstr "Zvolte „Všechny stránky z podavače“."
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='4d351a0cdd40bebe78b82da62265f3bd'"
 msgstr ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='4d351a0cdd40bebe78b82da62265f3bd'"
 
 #. (itstool) path: note/p
 #: C/adf.page:44
@@ -108,9 +108,9 @@ msgstr ""
 #: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
 msgctxt "_"
 msgid ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
 msgstr ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
diff --git a/help/cs/figures/preferences.png b/help/cs/figures/preferences.png
new file mode 100644
index 0000000..40a9852
--- /dev/null
+++ b/help/cs/figures/preferences.png
diff --git a/help/cs/figures/scan_toolbar.png b/help/cs/figures/scan_toolbar.png
new file mode 100644
index 0000000..07aa98b
--- /dev/null
+++ b/help/cs/figures/scan_toolbar.png
diff --git a/help/de/figures/preferences.png b/help/de/figures/preferences.png
index 0da9419..ab59993 100644
--- a/help/de/figures/preferences.png
+++ b/help/de/figures/preferences.png
diff --git a/help/de/figures/scan_toolbar.png b/help/de/figures/scan_toolbar.png
index abd5d0a..f9e9da1 100644
--- a/help/de/figures/scan_toolbar.png
+++ b/help/de/figures/scan_toolbar.png
diff --git a/help/es/es.po b/help/es/es.po
index 6797915..7132fcd 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 # Rodrigo <rodhos92@gmail.com>, 2018.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2017, 2018.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2017-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-08-22 02:28+0000\n"
-"PO-Revision-Date: 2018-08-23 10:19+0200\n"
+"POT-Creation-Date: 2019-03-11 08:58+0000\n"
+"PO-Revision-Date: 2019-03-14 15:48+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-23 05:24+0000\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 3.31.90\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2017 - 2019\n"
 "Rodrigo Lledó <rodhos92@gmail.com>, 2018\n"
-"Daniel Mustieles <daniel.mustieles@gmail.com>, 2017\n"
 "\n"
 "Launchpad Contributions:\n"
 "  Adolfo Jayme https://launchpad.net/~fitojb\n"
@@ -93,13 +93,17 @@ msgstr "Elija «Todas las páginas del alimentador»."
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/adf.page:38 C/scanning.page:20
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/scan_toolbar.png' "
+#| "md5='2e62090aa7d7a46e2f4ece06c981bc09'"
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='4d351a0cdd40bebe78b82da62265f3bd'"
 msgstr ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='4d351a0cdd40bebe78b82da62265f3bd'"
 
 #. (itstool) path: note/p
 #: C/adf.page:44
@@ -119,11 +123,15 @@ msgstr ""
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/preferences.png' "
+#| "md5='3e9041b5cf2d26bb7576192fa7babd0e'"
 msgctxt "_"
 msgid ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
 msgstr ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
diff --git a/help/fr/figures/preferences.png b/help/fr/figures/preferences.png
index 0462578..a1dcb17 100644
--- a/help/fr/figures/preferences.png
+++ b/help/fr/figures/preferences.png
diff --git a/help/fr/figures/scan_toolbar.png b/help/fr/figures/scan_toolbar.png
index d0db9cb..fb07a9d 100644
--- a/help/fr/figures/scan_toolbar.png
+++ b/help/fr/figures/scan_toolbar.png
diff --git a/help/fr/fr.po b/help/fr/fr.po
index a2b2214..9689c43 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -4,21 +4,23 @@
 # Jean-Marc https://launchpad.net/~m-balthazar
 # Pierre-Cyril https://launchpad.net/~jokaz-junk
 # Guillaume Bernard <associations@guillaume-bernard.fr>, 2018
+# Charles Monzat <charles.monzat@numericable.fr>, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-03-11 09:30+0000\n"
-"PO-Revision-Date: 2018-03-12 18:29+0100\n"
+"POT-Creation-Date: 2019-03-11 08:58+0000\n"
+"PO-Revision-Date: 2019-03-18 20:43+0100\n"
 "Last-Translator: Guillaume Bernard <associations@guillaume-bernard.fr>\n"
-"Language-Team: French <fr@li.org>\n"
+"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.2.1\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -33,7 +35,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
-msgstr "Utilisation du chargeur automatique de documents"
+msgstr "Utilisation du bac d’alimentation automatique"
 
 #. (itstool) path: page/p
 #: C/adf.page:11
@@ -41,9 +43,9 @@ msgid ""
 "If your scanner features an Automatic Document Feeder (ADF) you can scan all "
 "the pages from the feeder via one of following methods:"
 msgstr ""
-"Si votre périphérique de numérisation propose un chargeur automatique de "
-"documents (ADF) vous pouvez numériser toutes les pages depuis le chargeur en "
-"suivant une des méthodes suivantes :"
+"Si votre périphérique de numérisation propose un bac d’alimentation "
+"automatique (ADF), vous pouvez numériser toutes les pages depuis le bac "
+"d’alimentation en suivant une des méthodes suivantes :"
 
 #. (itstool) path: steps/title
 #: C/adf.page:16
@@ -67,12 +69,12 @@ msgid ""
 "Feeder</gui></guiseq>."
 msgstr ""
 "Naviguez vers <guiseq><gui>Document</gui> <gui>Numériser</gui><gui>Toutes "
-"les pages du chargeur</gui></guiseq>."
+"les pages du bac d’alimentation</gui></guiseq>."
 
 #. (itstool) path: steps/title
 #: C/adf.page:32
 msgid "Use the Toolbar Buttons"
-msgstr "Utiliser les boutons de la barre d'outils"
+msgstr "Utiliser les boutons de la barre d’outils"
 
 #. (itstool) path: item/p
 #: C/adf.page:34
@@ -82,7 +84,7 @@ msgstr "Cliquez sur la flèche à droite du bouton « Numériser »."
 #. (itstool) path: item/p
 #: C/adf.page:37
 msgid "Choose \"All Pages From Feeder\"."
-msgstr "Sélectionnez « Toutes les pages du chargeur »."
+msgstr "Sélectionnez « Toutes les pages du bac d’alimentation »."
 
 #. (itstool) path: item/media
 #. This is a reference to an external file such as an image or video. When
@@ -93,7 +95,7 @@ msgstr "Sélectionnez « Toutes les pages du chargeur »."
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='4d351a0cdd40bebe78b82da62265f3bd'"
 msgstr ""
 "external ref='figures/scan_toolbar.png' "
 "md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
@@ -119,7 +121,7 @@ msgstr ""
 #: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
 msgctxt "_"
 msgid ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
 msgstr ""
 "external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
 
@@ -252,8 +254,8 @@ msgid ""
 "gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
 "La résolution par défaut pour un document <gui><em>Texte</em></gui> est de "
-"150 ppp (points par pouce), pour un document <gui><em>Photo</em></gui>, elle "
-"est de 300 ppp. Vous pouvez modifier ces réglages dans le menu "
+"150 ppp (points par pouce), pour un document <gui><em>Photo</em></gui>, elle "
+"est de 300 ppp. Vous pouvez modifier ces réglages dans le menu "
 "<guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>."
 
 #. (itstool) path: page/p
@@ -268,52 +270,52 @@ msgstr ""
 #. (itstool) path: td/p
 #: C/dpi.page:23
 msgid "<em>Text Resolution</em>"
-msgstr "<em>Résolution texte</em>"
+msgstr "<em>Résolution du texte</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:24
 msgid "<em>Photo Resolution</em>"
-msgstr "<em>Résolution photo</em>"
+msgstr "<em>Résolution de la photo</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:27 C/dpi.page:28
 msgid "75 dpi (draft)"
-msgstr "75 ppp (brouillon)"
+msgstr "75 ppp (brouillon)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:31
 msgid "150 dpi (default)"
-msgstr "150 ppp (par défaut)"
+msgstr "150 ppp (par défaut)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:32
 msgid "150 dpi"
-msgstr "150 ppp"
+msgstr "150 ppp"
 
 #. (itstool) path: td/p
 #: C/dpi.page:35
 msgid "300 dpi"
-msgstr "300 ppp"
+msgstr "300 ppp"
 
 #. (itstool) path: td/p
 #: C/dpi.page:36
 msgid "300 dpi (default)"
-msgstr "300 ppp (par défaut)"
+msgstr "300 ppp (par défaut)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:39 C/dpi.page:40
 msgid "600 dpi"
-msgstr "600 ppp"
+msgstr "600 ppp"
 
 #. (itstool) path: td/p
 #: C/dpi.page:43 C/dpi.page:44
 msgid "1200 dpi (high resolution)"
-msgstr "1200 ppp (haute résolution)"
+msgstr "1200 ppp (haute résolution)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:47 C/dpi.page:48
 msgid "2400 dpi"
-msgstr "2400 ppp"
+msgstr "2400 ppp"
 
 #. (itstool) path: note/p
 #: C/dpi.page:52
@@ -340,7 +342,7 @@ msgid ""
 "document as an attachment."
 msgstr ""
 "Pour envoyer le document actuel par courriel, choisissez le menu "
-"<guiseq><gui>Document</gui><gui>Courriel</gui></guiseq>(<keyseq><key>Ctrl</"
+"<guiseq><gui>Document</gui><gui>Courriel</gui></guiseq> (<keyseq><key>Ctrl</"
 "key><key>E</key></keyseq>). Votre logiciel de messagerie électronique "
 "s’ouvrira avec un nouveau message qui contiendra le document numérisé en "
 "pièce jointe."
@@ -352,7 +354,7 @@ msgid ""
 "attachment for each page. Conversely, if the document type was set to \"Photo"
 "\", the email will have a JPEG attachment for each page."
 msgstr ""
-"Si le type de document a été réglé sur « Texte » le courriel aura une pièce "
+"Si le type de document a été réglé sur « Texte », le courriel aura une pièce "
 "jointe PDF pour chaque page. À l’inverse, si le type de document a été réglé "
 "sur « Photo », le courriel aura une pièce jointe JPEG pour chaque page."
 
@@ -360,8 +362,8 @@ msgstr ""
 #: C/email.page:21
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
-"Consultez <link xref=\"save\"/> pour plus d’information à propos des formats "
-"de fichiers."
+"Consultez <link xref=\"save\"/> pour plus d’informations à propos des "
+"formats de fichiers."
 
 #. (itstool) path: credit/name
 #: C/index.page:7
@@ -466,7 +468,7 @@ msgid ""
 "From the \"Print\" dialog box choose your desired printing settings and/or "
 "Print Preview the document, then press the \"Print\" button."
 msgstr ""
-"Depuis la boîte de dialogue « Imprimer » sélectionnez vos paramètres "
+"Depuis la boîte de dialogue « Imprimer », sélectionnez vos paramètres "
 "d’impression désirés et/ou prévisualisez le document puis cliquez sur le "
 "bouton « Imprimer »."
 
@@ -486,13 +488,13 @@ msgid ""
 "Lossy_compression\">Lossy compression Wikipedia page</link> for more "
 "information."
 msgstr ""
-"Vous pouvez ajuster la qualité d’image utilisée lorsque la numérisation est "
-"convertie en fichier en changeant ce paramètre dans la fenêtre "
-"d’enregistrement. L’utilisation d’une qualité moindre se traduira par une "
-"petite taille de fichier, mais pourra présenter un certain flou ou une "
+"Vous pouvez ajuster la qualité d’image utilisée, lorsque la numérisation est "
+"convertie en fichier, en changeant ce paramètre dans la fenêtre "
+"d’enregistrement. L’utilisation d’une qualité faible se traduit par une "
+"petite taille de fichier, mais peut présenter un certain flou ou une "
 "pixellisation de l’image. Une qualité élevée permet de conserver toutes les "
 "informations numérisées, mais nécessite une taille de fichier plus "
-"volumineux. Consultez la <link href=\"https://fr.wikipedia.org/wiki/"
+"importante. Consultez la <link href=\"https://fr.wikipedia.org/wiki/"
 "Compression_de_donn%C3%A9es#Compression_avec_pertes\">page Wikipédia sur la "
 "compression de données</link> pour plus d’informations."
 
@@ -535,8 +537,8 @@ msgid ""
 "a page:"
 msgstr ""
 "Dans <app>Simple Scan</app>, vous pouvez changer l’orientation d’une page "
-"avant ou après la numérisation. Actuellement, il y a quatre façons de faire "
-"pivoter une page :"
+"avant ou après la numérisation. Actuellement, il existe quatre façons de "
+"faire pivoter une page :"
 
 #. (itstool) path: steps/title
 #: C/rotate.page:17
@@ -611,7 +613,7 @@ msgstr "Faire pivoter vers la gauche"
 #. (itstool) path: td/p
 #: C/rotate.page:44
 msgid "<key>[</key> (left bracket)"
-msgstr "<key>[</key> (crochet gauche)"
+msgstr "<key>[</key> (crochet ouvrant)"
 
 #. (itstool) path: td/p
 #: C/rotate.page:47
@@ -621,7 +623,7 @@ msgstr "Faire pivoter vers la droite"
 #. (itstool) path: td/p
 #: C/rotate.page:48
 msgid "<key>]</key> (right bracket)"
-msgstr "<key>]</key> (crochet droit)"
+msgstr "<key>]</key> (crochet fermant)"
 
 #. (itstool) path: note/p
 #: C/rotate.page:54
@@ -821,7 +823,7 @@ msgstr ""
 #. (itstool) path: item/p
 #: C/scanning.page:17
 msgid "Open <app>Simple Scan</app>."
-msgstr "Ouvrir l’application <app>Simple Scan</app>."
+msgstr "Ouvrez l’application <app>Simple Scan</app>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:18
@@ -829,8 +831,8 @@ msgid ""
 "Click the arrow to the right of the \"Scan\" button and choose the type of "
 "document you are scanning: <em>Photo</em> or <em>Text</em>."
 msgstr ""
-"Cliquez sur la flèche à droite du bouton « Numériser »  et sélectionnez le "
-"type de document que vous voulez numériser : <em>Photo</em> ou <em>Texte</"
+"Cliquez sur la flèche à droite du bouton « Numériser » et sélectionnez le "
+"type de document que vous souhaitez numériser : <em>Photo</em> ou <em>Texte</"
 "em>."
 
 #. (itstool) path: item/p
diff --git a/help/gl/gl.po b/help/gl/gl.po
index 7b2a1f4..086a1e6 100644
--- a/help/gl/gl.po
+++ b/help/gl/gl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan master\n"
-"POT-Creation-Date: 2018-02-23 12:28+0000\n"
-"PO-Revision-Date: 2018-03-14 23:52+0100\n"
+"POT-Creation-Date: 2018-03-14 22:53+0000\n"
+"PO-Revision-Date: 2018-03-28 00:55+0200\n"
 "Last-Translator: marcos <marcoslansgarza@gmail.com>\n"
 "Language-Team: Galician <gnome-gl-list@gnome.org>\n"
 "Language: gl\n"
@@ -18,8 +18,7 @@ msgstr ""
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
-msgstr ""
-"Marcos Lans <marcoslansgarza@gmail.com>, 2018"
+msgstr "Marcos Lans <marcoslansgarza@gmail.com>, 2018"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -96,8 +95,8 @@ msgid ""
 "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
 "De forma predeterminada, escanearanse ambas as caras dunha folla se o "
-"escáner ten esa capacidade. Pode seleccionar o  escaneo dunha soa cara no "
-"menú <guiseq><gui>Documento</gui><gui>Preferencias</gui></guiseq>."
+"escáner ten esa capacidade. Pode seleccionar o  escaneamento dunha soa cara "
+"no menú <guiseq><gui>Documento</gui><gui>Preferencias</gui></guiseq>."
 
 #. (itstool) path: note/media
 #. (itstool) path: page/media
@@ -247,7 +246,7 @@ msgid ""
 "The available scanning resolutions for both document types (Text and Photo) "
 "are the same and are listed in the following table:"
 msgstr ""
-"As resolucións de escaneo dispoñíbeis para ambos os tipos de documento "
+"As resolucións de escaneamento dispoñíbeis para ambos os tipos de documento "
 "(texto e foto) son as mesmas e lístanse na seguinte táboa:"
 
 #. (itstool) path: td/p
@@ -374,7 +373,7 @@ msgstr ""
 #. (itstool) path: section/title
 #: C/index.page:20
 msgid "Scanning Pages"
-msgstr "Escaneo de páxinas"
+msgstr "Escaneamento de páxinas"
 
 #. (itstool) path: section/title
 #: C/index.page:24
@@ -512,7 +511,8 @@ msgid ""
 "a page:"
 msgstr ""
 "No <app>Escáner sinxelo</app> pode cambiar a rotación da páxina antes ou "
-"despois do escaneo. Actualmente existen catro formas de rotar unha páxina:"
+"despois do escaneamento. Actualmente existen catro formas de rotar unha "
+"páxina:"
 
 #. (itstool) path: steps/title
 #: C/rotate.page:17
@@ -812,9 +812,9 @@ msgid ""
 "the <key>Esc</key> key on the keyboard. Each page you scan is placed at the "
 "end of the document."
 msgstr ""
-"A páxina mostrarase mentres é escaneada. Para deter o escaneo en calquera "
-"momento prema <key>Esc</key> no teclado. Cada páxina que escanee situarase "
-"ao final do documento."
+"A páxina mostrarase mentres é escaneada. Para deter o escaneamento en "
+"calquera momento prema <key>Esc</key> no teclado. Cada páxina que escanee "
+"situarase ao final do documento."
 
 #. (itstool) path: page/p
 #: C/scanning.page:29
diff --git a/help/hu/figures/preferences.png b/help/hu/figures/preferences.png
new file mode 100644
index 0000000..426a470
--- /dev/null
+++ b/help/hu/figures/preferences.png
diff --git a/help/hu/figures/scan_toolbar.png b/help/hu/figures/scan_toolbar.png
new file mode 100644
index 0000000..4bc2c7d
--- /dev/null
+++ b/help/hu/figures/scan_toolbar.png
diff --git a/help/hu/hu.po b/help/hu/hu.po
index 088c957..57c8dc4 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -1,29 +1,29 @@
-# Hungarian translation for simple-scan.
-# Copyright (c) 2012, 2014, 2017, 2018 Rosetta Contributors and Canonical Ltd 2012
+# Hungarian translation for simple-scan help.
+# Copyright (c) 2012, 2014, 2017, 2018, 2019 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the simple-scan package.
 #
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2014, 2017.
-# Balázs Úr <urbalazs at gmail dot com>, 2018.
+# Balázs Úr <ur.balazs at fsf dot hu>, 2018, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: simple-scan\n"
+"Project-Id-Version: simple-scan-help master\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-12-06 20:21+0000\n"
-"PO-Revision-Date: 2018-01-29 20:46+0200\n"
-"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
-"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
+"POT-Creation-Date: 2019-03-09 13:11+0000\n"
+"PO-Revision-Date: 2019-03-10 00:04+0100\n"
+"Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
+"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
-msgstr "Kelemen Gábor <kelemeng at ubuntu dot com>"
+msgstr "Kelemen Gábor <kelemeng at ubuntu dot com>, 2014, 2019."
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -84,13 +84,17 @@ msgstr "Válassza a „Minden oldal az adagolóból” almenüt."
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/adf.page:38 C/scanning.page:20
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/scan_toolbar.png' "
+#| "md5='2e62090aa7d7a46e2f4ece06c981bc09'"
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='4d351a0cdd40bebe78b82da62265f3bd'"
 msgstr ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='4d351a0cdd40bebe78b82da62265f3bd'"
 
 #. (itstool) path: note/p
 #: C/adf.page:44
@@ -110,11 +114,15 @@ msgstr ""
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/preferences.png' "
+#| "md5='3e9041b5cf2d26bb7576192fa7babd0e'"
 msgctxt "_"
 msgid ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
 msgstr ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
@@ -844,3 +852,4 @@ msgstr ""
 "<gui><em>Fénykép</em></gui> lehetőséget a nagy felbontású, színes "
 "beolvasáshoz. További részletekért és beállításokért lásd <link xref=\"dpi\"/"
 "> oldalt."
+
diff --git a/help/pl/figures/preferences.png b/help/pl/figures/preferences.png
index b11c96b..18dbde2 100644
--- a/help/pl/figures/preferences.png
+++ b/help/pl/figures/preferences.png
diff --git a/help/pl/figures/scan_toolbar.png b/help/pl/figures/scan_toolbar.png
index eaeb089..cae956e 100644
--- a/help/pl/figures/scan_toolbar.png
+++ b/help/pl/figures/scan_toolbar.png
diff --git a/help/pl/pl.po b/help/pl/pl.po
index 4c923d7..c87e324 100644
--- a/help/pl/pl.po
+++ b/help/pl/pl.po
@@ -1,14 +1,14 @@
 # Polish translation for simple-scan help.
-# Copyright © 2017-2018 the simple-scan authors.
+# Copyright © 2017-2019 the simple-scan authors.
 # This file is distributed under the same license as the simple-scan help.
-# Piotr Drąg <piotrdrag@gmail.com>, 2017-2018.
-# Aviary.pl <community-poland@mozilla.org>, 2017-2018.
+# Piotr Drąg <piotrdrag@gmail.com>, 2017-2019.
+# Aviary.pl <community-poland@mozilla.org>, 2017-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan-help\n"
-"POT-Creation-Date: 2017-12-06 20:21+0000\n"
-"PO-Revision-Date: 2018-02-04 23:40+0100\n"
+"POT-Creation-Date: 2019-03-09 13:11+0000\n"
+"PO-Revision-Date: 2019-03-09 18:25+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -22,8 +22,8 @@ msgstr ""
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
-"Piotr Drąg <piotrdrag@gmail.com>, 2017-2018\n"
-"Aviary.pl <community-poland@mozilla.org>, 2017-2018"
+"Piotr Drąg <piotrdrag@gmail.com>, 2017-2019\n"
+"Aviary.pl <community-poland@mozilla.org>, 2017-2019"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -87,10 +87,10 @@ msgstr "Wybierz „Wszystkie strony z podajnika”."
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='4d351a0cdd40bebe78b82da62265f3bd'"
 msgstr ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='4d351a0cdd40bebe78b82da62265f3bd'"
 
 #. (itstool) path: note/p
 #: C/adf.page:44
@@ -112,9 +112,9 @@ msgstr ""
 #: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
 msgctxt "_"
 msgid ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
 msgstr ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
diff --git a/help/pt_BR/figures/preferences.png b/help/pt_BR/figures/preferences.png
new file mode 100644
index 0000000..b9cf1ca
--- /dev/null
+++ b/help/pt_BR/figures/preferences.png
diff --git a/help/pt_BR/figures/scan_toolbar.png b/help/pt_BR/figures/scan_toolbar.png
new file mode 100644
index 0000000..6d71b45
--- /dev/null
+++ b/help/pt_BR/figures/scan_toolbar.png
diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po
index f996736..8940ed8 100644
--- a/help/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
@@ -1,22 +1,23 @@
 # Brazilian Portuguese translation for simple-scan
 # Copyright (c) 2018 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the simple-scan package.
-# Rafael Fontenelle <rafaelff@gnome.org>, 2017, 2018.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2017-2019.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product"
-"=simple-scan&component=general\n"
-"POT-Creation-Date: 2018-02-20 23:24+0000\n"
-"PO-Revision-Date: 2018-03-05 11:22-0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&component=general\n"
+"POT-Creation-Date: 2019-03-11 08:58+0000\n"
+"PO-Revision-Date: 2019-03-17 20:30-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
-"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+"Language-Team: Portuguese - Brazil <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"X-Generator: Gtranslator 3.32.0\n"
 "X-Launchpad-Export-Date: 2016-12-19 05:09+0000\n"
 "X-Project-Style: gnome\n"
 
@@ -25,7 +26,7 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "GNOME Contributions:\n"
-"  Rafael Fontenelle <rafaelff@gnome.org>, 2017, 2018\n"
+"  Rafael Fontenelle <rafaelff@gnome.org>, 2017-2019\n"
 "\n"
 "Launchpad Contributions:\n"
 "  Neliton Pereira Jr. https://launchpad.net/~nelitonpjr\n"
@@ -94,10 +95,10 @@ msgstr "Escolha “Todas as páginas do alimentador”."
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='4d351a0cdd40bebe78b82da62265f3bd'"
 msgstr ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='679feb0230d271da36597752ebc05dd2'"
 
 #. (itstool) path: note/p
 #: C/adf.page:44
@@ -119,9 +120,9 @@ msgstr ""
 #: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
 msgctxt "_"
 msgid ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
 msgstr ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='96ce6196245b66d6e77ffe91e2624abf'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
@@ -148,13 +149,6 @@ msgstr "Recortando"
 
 #. (itstool) path: page/p
 #: C/crop.page:11
-#| msgid ""
-#| "The cropping feature in <app>Simple Scan</app> allows you to use only a "
-#| "part of a scanned image. You can enable crop either before or after "
-#| "scanning a page, and you can always change the dimensions of the crop "
-#| "frame. When crop is enabled, a mask will apper over the current page with "
-#| "the area not being used shown in gray. You can enable crop and choose the "
-#| "desired dimensions via one of the following methods:"
 msgid ""
 "The cropping feature in <app>Simple Scan</app> allows you to use only a part "
 "of a scanned image. You can enable crop either before or after scanning a "
diff --git a/help/ro/ro.po b/help/ro/ro.po
index 00cefee..e05f72e 100644
--- a/help/ro/ro.po
+++ b/help/ro/ro.po
@@ -6,22 +6,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan master\n"
-"POT-Creation-Date: 2018-03-05 15:23+0000\n"
-"PO-Revision-Date: 2018-03-10 16:57+0200\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-13 18:06+0100\n"
 "Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
-"Language-Team: Gnome Romanian Translation Team\n"
+"Language-Team: Gnome Romanian Translation Team <gnomero-list@lists."
+"sourceforge.net>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2);;\n"
-"X-Generator: Virtaal 0.7.1\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && n"
+"%100<=19) ? 1 : 2);\n"
+"X-Generator: Poedit 2.2.1\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
-msgstr "Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2018"
+msgstr "Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2018-2019"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -85,10 +86,10 @@ msgstr "Alegeți „Toate paginile din tava cu foi de hârtie”."
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='2e62090aa7d7a46e2f4ece06c981bc09'"
 msgstr ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='2e62090aa7d7a46e2f4ece06c981bc09'"
 
 #. (itstool) path: note/p
 #: C/adf.page:44
@@ -110,9 +111,9 @@ msgstr ""
 #: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
 msgctxt "_"
 msgid ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='3e9041b5cf2d26bb7576192fa7babd0e'"
 msgstr ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='3e9041b5cf2d26bb7576192fa7babd0e'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
@@ -129,8 +130,8 @@ msgid ""
 msgstr ""
 "Unele scanere permit utilizatorului să ajusteze luminozitatea și contrastul "
 "la scanare. Dacă scanările dumneavoastră ies prea întunecate sau prea "
-"luminate puteți ajusta aceste configurări din meniul "
-"<guiseq><gui>Documente</gui><gui>Preferințe</gui></guiseq>."
+"luminate puteți ajusta aceste configurări din meniul <guiseq><gui>Documente</"
+"gui><gui>Preferințe</gui></guiseq>."
 
 #. (itstool) path: page/title
 #: C/crop.page:9
@@ -183,7 +184,7 @@ msgstr "Clic și țineți apăsat pe cadru, apoi mutați-l la poziția dorită."
 #: C/crop.page:28
 msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
 msgstr ""
-"Navigând la meniul <guiseq><gui>Pagină</gui><gui>Decupează</gui></guiseq>"
+"Navigând la meniul <guiseq><gui>Pagină</gui><gui>Decupează</gui></guiseq>."
 
 #. (itstool) path: item/p
 #: C/crop.page:29
@@ -239,9 +240,9 @@ msgid ""
 "gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
 "Rezoluția implicită pentru tipul de document <gui><em>Text</em></gui> este "
-"de 150 dpi (puncte pe țol) și pentru tipul de document "
-"<gui><em>Foto</em></gui> este de 300 dpi. Puteți schimba aceste configurări "
-"din meniul <guiseq><gui>Documente</gui><gui>Preferințe</gui></guiseq>."
+"de 150 dpi (puncte pe țol) și pentru tipul de document <gui><em>Foto</em></"
+"gui> este de 300 dpi. Puteți schimba aceste configurări din meniul "
+"<guiseq><gui>Documente</gui><gui>Preferințe</gui></guiseq>."
 
 #. (itstool) path: page/p
 #: C/dpi.page:18
@@ -250,7 +251,7 @@ msgid ""
 "are the same and are listed in the following table:"
 msgstr ""
 "Rezoluțiile disponibile pentru ambele tipuri de documente (text și foto) "
-"sunt aceleași și sunt listate în tabelul următor."
+"sunt aceleași și sunt listate în tabelul următor:"
 
 #. (itstool) path: td/p
 #: C/dpi.page:23
@@ -327,9 +328,9 @@ msgid ""
 "document as an attachment."
 msgstr ""
 "Pentru a trimite prin e-mail documentul curent folosiți meniul "
-"<guiseq><gui>Documente</gui><gui>E-mail</gui></guiseq> "
-"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Programul dumneavoastră de e-"
-"mail va fi deschi cu un nou mesaj ce conține documentul scanat ca atașament."
+"<guiseq><gui>Documente</gui><gui>E-mail</gui></guiseq> (<keyseq><key>Ctrl</"
+"key><key>E</key></keyseq>). Programul dumneavoastră de e-mail va fi deschi "
+"cu un nou mesaj ce conține documentul scanat ca atașament."
 
 #. (itstool) path: page/p
 #: C/email.page:16
@@ -393,7 +394,8 @@ msgstr "Utilizarea documentului"
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
-msgstr "Licență Creative Commons Atribuire-Distribuire în condiții identice 3.0"
+msgstr ""
+"Licență Creative Commons Atribuire-Distribuire în condiții identice 3.0"
 
 #. (itstool) path: license/p
 #: C/legal.xml:3
@@ -442,9 +444,8 @@ msgid ""
 "will open the \"Print\" dialog box."
 msgstr ""
 "Navigați la meniul <guiseq><gui>Documente</gui><gui>Tipărește</gui></guiseq> "
-"sau folosiți scurtătura de tastatură "
-"<keyseq><key>Ctrl</key><key>P</key></keyseq>. Aceasta va deschide căsuța de "
-"dialog „Tipărire”."
+"sau folosiți scurtătura de tastatură <keyseq><key>Ctrl</key><key>P</key></"
+"keyseq>. Aceasta va deschide căsuța de dialog „Tipărire”."
 
 #. (itstool) path: item/p
 #: C/print.page:25
@@ -476,9 +477,9 @@ msgstr ""
 "salvare. Folosind o calitate joasă va rezulta într-un fișier de dimensiune "
 "mică dar imaginea rezultată va avea zone încețoșate. O calitate înaltă va "
 "păstra toate informațiile scanate dar necesită o fișier de dimensiuni mai "
-"mari. Consultați <link href=\"https://en.wikipedia.org/wiki/"
-"Lossy_compression\">pagina Wikipedia pentru aloritmul de compresie cu "
-"pierderi</link> pentru mai multe informații."
+"mari. Consultați <link href=\"https://en.wikipedia.org/wiki/Lossy_compression"
+"\">pagina Wikipedia pentru aloritmul de compresie cu pierderi</link> pentru "
+"mai multe informații."
 
 #. (itstool) path: page/title
 #: C/reorder.page:9
@@ -501,9 +502,9 @@ msgid ""
 "<gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui> from the "
 "\"Page\" menu."
 msgstr ""
-"Alternativ, puteți muta o pagină selectând-o mai întâi apoi apăsând <gui><em>"
-"Mută la stânga</em></gui> sau <gui><em>Mută la dreapta</em></gui> din meniul "
-"„Pagină”."
+"Alternativ, puteți muta o pagină selectând-o mai întâi apoi apăsând "
+"<gui><em>Mută la stânga</em></gui> sau <gui><em>Mută la dreapta</em></gui> "
+"din meniul „Pagină”."
 
 #. (itstool) path: page/title
 #: C/rotate.page:9
@@ -618,9 +619,9 @@ msgid ""
 "Navigate to the <guiseq><gui>Document</gui><gui>Save As</gui></guiseq> menu "
 "(or press <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>)."
 msgstr ""
-"Navigați la meniul <guiseq><gui>Documente</gui><gui>Salvează "
-"ca</gui></guiseq> (sau apăsați "
-"<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>)."
+"Navigați la meniul <guiseq><gui>Documente</gui><gui>Salvează ca</gui></"
+"guiseq> (sau apăsați <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></"
+"keyseq>)."
 
 #. (itstool) path: item/p
 #: C/save.page:18
@@ -669,10 +670,10 @@ msgstr ""
 "Un PDF poate conține mai multe pagini, ca și o carte, și este ușor de "
 "distribuit. Doar un număr mic de programe GNU/Linux poate modifica documente "
 "PDF, așa că acest format este recomandat în principal pentru arhivare. "
-"Dimensiunea documentului PDF este afectată de <link xref=\"quality\">"
-"calitatea imaginii</link>. Consultați <link href=\""
-"http://en.wikipedia.org/wiki/pdf\">pagina Wikipedia pentru PDF</link> pentru "
-"mai multe informații."
+"Dimensiunea documentului PDF este afectată de <link xref=\"quality"
+"\">calitatea imaginii</link>. Consultați <link href=\"http://en.wikipedia."
+"org/wiki/pdf\">pagina Wikipedia pentru PDF</link> pentru mai multe "
+"informații."
 
 #. (itstool) path: td/p
 #: C/save.page:43
@@ -697,10 +698,10 @@ msgstr ""
 "sistemelor de operare vin preinstalate cu un editor JPEG. Dacă ați scanat "
 "mai multe pagini, un fișier JPEG va fi creeat pentru fiecare pagină. "
 "Utilizați acest tip de fișier dacă doriți să modificați sau să încărcați "
-"fișiere scanate. Dimensiunea fișierului JPEG este afectată de <link xref=\""
-"quality\">calitatea imaginii</link>. Consultați <link href=\""
-"https://ro.wikipedia.org/wiki/JPEG\">pagina Wikipedia pentru JPEG</link> "
-"pentru mai multe informații."
+"fișiere scanate. Dimensiunea fișierului JPEG este afectată de <link xref="
+"\"quality\">calitatea imaginii</link>. Consultați <link href=\"https://ro."
+"wikipedia.org/wiki/JPEG\">pagina Wikipedia pentru JPEG</link> pentru mai "
+"multe informații."
 
 #. (itstool) path: td/p
 #: C/save.page:53
@@ -738,8 +739,8 @@ msgid ""
 msgstr ""
 "Fișierele TIFF conțin date neprelucrate de la scaner. Asta le face foarte "
 "mari și nu sunt practice pentru a fi distribuite. Dacă ați scanat pagini "
-"multiple, un fișier TIFF va fi creeat pentru fiecare pagină. Consultați <"
-"link href=\"http://en.wikipedia.org/wiki/Tagged_Image_File_Format\">pagina "
+"multiple, un fișier TIFF va fi creeat pentru fiecare pagină. Consultați "
+"<link href=\"http://en.wikipedia.org/wiki/Tagged_Image_File_Format\">pagina "
 "Wikipedia TIFF</link> pentru mai multe informații."
 
 #. (itstool) path: page/title
@@ -754,8 +755,8 @@ msgid ""
 "from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
 "Dacă aveți mai multe dispozitive de scanare puteți schimba dispozitivul "
-"selectat din meniul "
-"<guiseq><gui>Documente</gui><gui>Preferințe</gui></guiseq>."
+"selectat din meniul <guiseq><gui>Documente</gui><gui>Preferințe</gui></"
+"guiseq>."
 
 #. (itstool) path: page/p
 #: C/scanner.page:15
diff --git a/help/sv/sv.po b/help/sv/sv.po
index f0f40d1..2ad22d1 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan master\n"
-"POT-Creation-Date: 2017-10-21 12:34+0000\n"
-"PO-Revision-Date: 2017-10-25 22:14+0200\n"
+"POT-Creation-Date: 2018-09-02 16:57+0000\n"
+"PO-Revision-Date: 2018-12-23 21:27+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.2\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -84,13 +84,17 @@ msgstr "Välj \"Alla sidor från matare\"."
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/adf.page:38 C/scanning.page:20
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/scan_toolbar.png' "
+#| "md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='2e62090aa7d7a46e2f4ece06c981bc09'"
 msgstr ""
 "external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+"md5='2e62090aa7d7a46e2f4ece06c981bc09'"
 
 #. (itstool) path: note/p
 #: C/adf.page:44
@@ -110,11 +114,15 @@ msgstr ""
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/preferences.png' "
+#| "md5='b9f6350ad552c954e8538596c7b42ac5'"
 msgctxt "_"
 msgid ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='3e9041b5cf2d26bb7576192fa7babd0e'"
 msgstr ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='3e9041b5cf2d26bb7576192fa7babd0e'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
diff --git a/meson.build b/meson.build
index a3bb0b8..cf9e5c7 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project ('simple-scan', ['vala', 'c'],
-         version: '3.30.2',
+         version: '3.32.2',
          license: 'GPLv3+',
          default_options: [
              'warning_level=1',
@@ -10,6 +10,8 @@ project ('simple-scan', ['vala', 'c'],
 gnome = import ('gnome')
 i18n = import ('i18n')
 
+app_id = 'org.gnome.SimpleScan'
+
 # Paths
 mandir = join_paths (get_option ('prefix'), get_option ('mandir'))
 localedir = join_paths (get_option ('prefix'), get_option ('localedir'))
diff --git a/po/LINGUAS b/po/LINGUAS
index 9bd2c0a..825f61e 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -29,6 +29,7 @@ hr
 hu
 hy
 id
+is
 it
 ja
 kk
@@ -39,6 +40,7 @@ ky
 lt
 lv
 mhr
+ml
 ms
 my
 nb
diff --git a/po/af.po b/po/af.po
index 8c36f54..edb6d02 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-01-22 02:21+0000\n"
-"PO-Revision-Date: 2018-02-09 21:25+0200\n"
+"POT-Creation-Date: 2018-10-04 20:47+0000\n"
+"PO-Revision-Date: 2019-01-20 23:28+0200\n"
 "Last-Translator: Pieter Schalk Schoeman <pieter@sonbesie.co.za>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "Language: af\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:09+0000\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -136,7 +136,7 @@ msgstr "Vertraging in millisekondes tussen bladsye."
 #. 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:1560
+#: src/app-window.ui:181 src/app-window.vala:1266 src/app-window.vala:1522
 msgid "Simple Scan"
 msgstr "Eenvoudige Skandeer"
 
@@ -175,201 +175,152 @@ msgstr "skandeer;skandeerder;platbed;adf;"
 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:820
-msgid "Single _Page"
-msgstr "Enkel _Bladsy"
-
-#. 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:829
-msgid "All Pages From _Feeder"
-msgstr "Alle Bladsye Vanaf _Voerder"
-
-#. 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:838
-msgid "_Multiple Pages From Flatbed"
-msgstr "_Veelvuldige bladsye vanaf platbed (flatbed)"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
-msgid "Text"
-msgstr "Teks"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
-msgid "Photo"
-msgstr "Foto"
-
-#. 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_andeer"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Staak skandering"
-
-#. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
-msgid "Reorder Pages"
-msgstr "Rangskik bladsye"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-pos"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Bladsy"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Roteer _linksom"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Roteer _regsom"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Insny"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter (VSA)"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal (VSA)"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
+#. Radio button for cropping page to A3
+#: src/app-window.ui:106
+msgid "A_3"
+msgstr "A_3"
+
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:397
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Pasmaak"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:415
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Roteer Insnit"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:428
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Beweeg na links"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:437
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Beweeg na regs"
 
-#. Label on help menu
-#: src/app-window.ui:474
-msgid "_Help"
-msgstr "_Hulp"
-
-#. Help|Contents menu
-#: src/app-window.ui:482
-msgid "_Contents"
-msgstr "_Inhoud"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Stop"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:520 src/app-window.ui:720
-msgid "Scan a single page from the scanner"
-msgstr "Skandeer 'n enkelbladsy vanaf die skandeerder"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Staak huidige skandering"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:522 src/app-window.ui:716
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Skandeer"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Skandeer 'n enkelbladsy vanaf die skandeerder"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:538 src/app-window.ui:787
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Stoor dokument na 'n lêer"
 
-#: src/app-window.ui:540
-msgid "Save"
-msgstr "Stoor"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Enkel bladsy"
 
-#. Tooltip for stop button
-#: src/app-window.ui:555 src/app-window.ui:700
-msgid "Stop the current scan"
-msgstr "Staak huidige skandering"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Alle Bladsye Vanaf _Voerder"
 
-#: src/app-window.ui:556 src/app-window.ui:697
-msgid "Stop"
-msgstr "Stop"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Veelvuldige bladsye vanaf platbed (flatbed)"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:611
-msgid "Searching for Scanners…"
-msgstr "Soek tans vir skandeerders…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Teks"
 
-#: src/app-window.vala:237 src/app-window.vala:1380
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Prent"
+
+#: src/app-window.vala:223 src/app-window.vala:1353
 msgid "_Close"
 msgstr "_Sluit"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:246
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "'n Gebruikersnaam en wagwoord is benodig vir toegang tot \"%s\""
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Soek tans vir skandeerders…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:266 src/app-window.vala:584
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Gereed om te skandeer"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:273
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Bykomende sagteware benodig"
 
 #. Instructions to install driver software
-#: src/app-window.vala:275
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -378,110 +329,110 @@ msgstr ""
 "installeer."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:281
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Geen skandeerders bespeur nie"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:283
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Maak seker dat u skandeerder aangeskakel en gekoppel is"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:298
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Stoor as…"
 
-#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+#: src/app-window.vala:297 src/app-window.vala:467 src/app-window.vala:548
 msgid "_Cancel"
 msgstr "_Kanselleer"
 
-#: src/app-window.vala:302 src/app-window.vala:553
+#: src/app-window.vala:298 src/app-window.vala:549
 msgid "_Save"
 msgstr "_Stoor"
 
 #. Default filename to use when saving document
-#: src/app-window.vala:310
+#: src/app-window.vala:306
 msgid "Scanned Document.pdf"
 msgstr "Geskandeerde dokument.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:316
+#: src/app-window.vala:312
 msgid "Image Files"
 msgstr "Beeldlêers"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:326
+#: src/app-window.vala:322
 msgid "All Files"
 msgstr "Alle lêers"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:335
+#: src/app-window.vala:331
 msgid "PDF (multi-page document)"
 msgstr "PDF (multibladsydokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:341
+#: src/app-window.vala:337
 msgid "JPEG (compressed)"
 msgstr "JPEG (saamgepers)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:347
+#: src/app-window.vala:343
 msgid "PNG (lossless)"
 msgstr "PNG (verliesloos)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:354
+#: src/app-window.vala:350
 msgid "WebP (compressed)"
 msgstr "WebP (saamgepers)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:364
+#: src/app-window.vala:360
 msgid "File format:"
 msgstr "Lêerformaat:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:376
+#: src/app-window.vala:372
 msgid "Compression:"
 msgstr "Saamperstipe:"
 
 #. 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:470
+#: src/app-window.vala:466
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "'n Lêer genaamd “%s” bestaan reeds.  Wil u dit vervang?"
 
 #. 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:473
+#: src/app-window.vala:469
 msgid "_Replace"
 msgstr "Ve_rvang"
 
-#: src/app-window.vala:512
+#: src/app-window.vala:508
 msgid "Saving"
 msgstr "Stoor tans"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:527
+#: src/app-window.vala:523
 msgid "Failed to save file"
 msgstr "Kon nie die leêr stoor nie"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:550
+#: src/app-window.vala:546
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "As u nie stoor nie, sal veranderinge permanent verlore wees."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:591
+#: src/app-window.vala:582
 msgid "Save current document?"
 msgstr "Stoor huidige dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:593
+#: src/app-window.vala:584
 msgid "Discard Changes"
 msgstr "Verwerp veranderinge"
 
 #. Label shown when scan started
-#: src/app-window.vala:692
+#: src/app-window.vala:717
 msgid "Contacting scanner…"
 msgstr "Maak tans kontak met skandeerder…"
 
@@ -495,33 +446,38 @@ msgstr "Kan nie beeld vir voorskou stoor nie"
 msgid "Unable to open image preview application"
 msgstr "Kan nie die beeldvoorskou-toepassing oopmaak nie"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:974 src/app-window.vala:1537
+msgid "Reorder Pages"
+msgstr "Rangskik bladsye"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:990
+#: src/app-window.vala:997
 msgid "Combine sides"
 msgstr "Kombineer kante"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1000
+#: src/app-window.vala:1007
 msgid "Combine sides (reverse)"
 msgstr "Kombineer kante (omgekeer)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1010
+#: src/app-window.vala:1017
 msgid "Reverse"
 msgstr "Keer om"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1020
+#: src/app-window.vala:1027
 msgid "Keep unchanged"
 msgstr "Hou onveranderd"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1250
+#: src/app-window.vala:1241
 msgid "Unable to open help file"
 msgstr "Kan nie hulp-lêer oopmaak nie"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1271
+#: src/app-window.vala:1256
 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"
@@ -551,16 +507,16 @@ msgstr ""
 "hierdie program ontvang. Indien nie, sien <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1274
+#: src/app-window.vala:1259 src/app-window.vala:1543
 msgid "About Simple Scan"
 msgstr "Aangaande Eenvoudige Skandeerder"
 
 #. Description of program
-#: src/app-window.vala:1277
+#: src/app-window.vala:1262
 msgid "Simple document scanning tool"
 msgstr "Eenvoudige dokument skandering gereedskap"
 
-#: src/app-window.vala:1286
+#: src/app-window.vala:1271
 msgid "translator-credits"
 msgstr ""
 "Pieter Schoeman\n"
@@ -574,22 +530,22 @@ msgstr ""
 "  Willem van der Colff https://launchpad.net/~wilalla"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1308
+#: src/app-window.vala:1287
 msgid "Save document before quitting?"
 msgstr "Stoor dokument voor afsluiting?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1310
+#: src/app-window.vala:1289
 msgid "Quit without Saving"
 msgstr "Sluit sonder om te stoor"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1357
+#: src/app-window.vala:1330
 msgid "You appear to have a Brother scanner."
 msgstr "Dit blyk dat u 'n Brother-skandeerder het."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1359
+#: src/app-window.vala:1332
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -598,12 +554,12 @@ msgstr ""
 "\">Brother webtuiste</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1363
+#: src/app-window.vala:1336
 msgid "You appear to have a Samsung scanner."
 msgstr "Dit blyk dat u 'n Samsung-skandeerder het."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1365
+#: src/app-window.vala:1338
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -612,17 +568,17 @@ msgstr ""
 "\">Samsung webtuiste</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1369
+#: src/app-window.vala:1342
 msgid "You appear to have an HP scanner."
 msgstr "Dit blyk dat u 'n HP-skandeerder het."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1347
 msgid "You appear to have an Epson scanner."
 msgstr "Dit blyk dat u 'n Epson-skandeerder het."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1349
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -631,114 +587,105 @@ msgstr ""
 "\">Epson webtuiste</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1380
+#: src/app-window.vala:1353
 msgid "Install drivers"
 msgstr "Installeer tans aandrywers"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1411
+#: src/app-window.vala:1386
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Eenvoudige Skandeerder moet na die installasie herbegin word."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1423
+#: src/app-window.vala:1399
 msgid "Installing drivers…"
 msgstr "Installeer tans aandrywers…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1431
+#: src/app-window.vala:1407
 msgid "Drivers installed successfully!"
 msgstr "Aandrywers suksesvol geïnstalleer!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1441
+#: src/app-window.vala:1417
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Kon nie aandrywers installeer nie (foutkode %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1447
+#: src/app-window.vala:1423
 msgid "Failed to install drivers."
 msgstr "Kon nie aandrywers installeer nie."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1454
+#: src/app-window.vala:1430
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "U moet %s pakket installeer."
 msgstr[1] "U moet %s pakkette installeer."
 
+#: src/app-window.vala:1536
+msgid "Email"
+msgstr "E-pos"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1568 src/app-window.vala:1591
-#: src/preferences-dialog.ui:53
+#: src/app-window.vala:1540 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Voorkeure"
 
-#: src/app-window.vala:1572
+#: src/app-window.vala:1541
 msgid "Keyboard Shortcuts"
 msgstr "Sleutelbordkortpaaie"
 
-#: src/app-window.vala:1573
+#: src/app-window.vala:1542
 msgid "Help"
 msgstr "Hulp"
 
-#: src/app-window.vala:1574
-msgid "About"
-msgstr "Aangaande"
-
-#: src/app-window.vala:1575
-msgid "Quit"
-msgstr "Sluit af"
-
-#: src/app-window.vala:1589
-msgid "Email"
-msgstr "E-pos"
-
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1599
+#: src/app-window.vala:1551
 msgid "Start Again…"
 msgstr "Begin weer…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1616
+#: src/app-window.vala:1570
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roteer die bladsy na links (anti-kloksgewys)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1623
+#: src/app-window.vala:1579
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roteer die bladsy na regs (kloksgewys)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1633
+#: src/app-window.vala:1591
 msgid "Crop the selected page"
 msgstr "Snoei die gekose bladsy"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1649
+#: src/app-window.vala:1609
 msgid "Delete the selected page"
 msgstr "Skrap die gekose bladsy"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1814
+#: src/app-window.vala:1753
 msgid "Cancel"
 msgstr "Kanselleer"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Verleen toegang"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Gebruikersnaam vir hulpbron:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Wagwoord:"
 
@@ -833,146 +780,146 @@ msgid "Copy current page to clipboard"
 msgstr "Kopieer huidige bladsy na knipbord"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Skandeerder"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Skandeer kant"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Bladsy grootte"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Voor"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Agter"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Beide"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Vertraag"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Veelvuldige bladsye vanaf platbed"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Sekondes"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Skandeer tans"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Teks resolusie"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Foto resolusie"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Helderheid"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontras"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kwaliteit"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Outomaties"
 
-#: src/preferences-dialog.vala:116
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Donkerder"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Ligter"
 
-#: src/preferences-dialog.vala:126
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Minder"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Meer"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:440
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (verstek resolusie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:443
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (konsep)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:446
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoë resolusie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:449
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -993,7 +940,7 @@ msgid "Unable to start scan"
 msgstr "Nie in staat om te begin skandeer nie"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1340
+#: src/scanner.vala:1240 src/scanner.vala:1347
 msgid "Error communicating with scanner"
 msgstr "Fout tydens kommunikasie met skandeerder"
 
@@ -1014,26 +961,59 @@ msgstr ""
 "was reg"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Skandering het misluk"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Skandeer tans"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[TOESTEL…] — Skandeernuts"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr "Voer \"%s --help\" uit om 'n volledige lys bevelreël opsies te sien."
 
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokument"
+
+#~ msgid "Sc_an"
+#~ msgstr "Sk_andeer"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Staak skandering"
+
+#~ msgid "_Email"
+#~ msgstr "_E-pos"
+
+#~ msgid "_Page"
+#~ msgstr "_Bladsy"
+
+#~ msgid "_Help"
+#~ msgstr "_Hulp"
+
+#~ msgid "_Contents"
+#~ msgstr "_Inhoud"
+
+#~ msgid "Save"
+#~ msgstr "Stoor"
+
+#~ msgid "About"
+#~ msgstr "Aangaande"
+
+#~ msgid "Quit"
+#~ msgstr "Sluit af"
+
 #~ msgid "Front and Back"
 #~ msgstr "Voor en agter"
 
diff --git a/po/be.po b/po/be.po
index 869b7bd..007512c 100644
--- a/po/be.po
+++ b/po/be.po
@@ -169,12 +169,12 @@ msgstr "Сканер дакументаў"
 #. 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
 msgid "scan;scanner;flatbed;adf;"
-msgstr "сканіраванне;сканаванне; сканер; планшэт; adf;"
+msgstr "сканіраванне;сканаванне;сканер;планшэт;adf;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/simple-scan.desktop.in:10
 msgid "scanner"
-msgstr "сканер"
+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
diff --git a/po/cs.po b/po/cs.po
index 0d8afeb..761e1a1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,22 +3,23 @@
 # This file is distributed under the same license as the simple-scan package.
 #
 # Tadeáš Pařík <tadeas.parik@gmail.com>, 2009.
-# Marek Černocký <marek@manet.cz>, 2017, 2018.
+# Marek Černocký <marek@manet.cz>, 2017, 2018, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-08-15 10:32+0200\n"
+"POT-Creation-Date: 2019-02-07 01:56+0000\n"
+"PO-Revision-Date: 2019-02-07 09:28+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
 msgid "Device to scan from"
@@ -135,7 +136,7 @@ msgstr "Prodleva v milisekundách, která se má ponechat mezi stránkami."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Jednoduché skenování"
 
@@ -176,206 +177,152 @@ msgstr ""
 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 "Jedna _stránka"
-
-#. 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 "Všechny stránky z _podavače"
-
-#. 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 "_Více ručně podávaných stránek"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Text"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Fotografie"
-
-#. 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_enovat"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Zastavit skenování"
-
-#. 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 "Přeskupit stránky"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-mail"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Stránka"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Otočit dop_rava"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Oříznout"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "Žád_né"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Vlastní"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Otočit ořez"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Posunout doleva"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Posunout doprava"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Nápověda"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Obsah"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Zastavit"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Naskenovat jednu stránku ze skeneru"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Zastavit probíhající skenování"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Skenovat"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Naskenovat jednu stránku ze skeneru"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Uložit dokument do souboru"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Uložit"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "Jedna _stránka"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Zastavit probíhající skenování"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Všechny stránky z _podavače"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Zastavit"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Více ručně podávaných stránek"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Vyhledávají se skenery…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Text"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Obrázek"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "Z_avřít"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Pro přístup k „%s“ je vyžadováno uživatelské jméno a heslo"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Vyhledávají se skenery…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Připraveno ke skenování"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Jsou zapotřebí ovladače skeneru"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -384,150 +331,156 @@ msgstr ""
 "skener."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Nebyl nalezen žádný skener"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Zkontrolujte prosím, že je váš skener připojený a zapnutý"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Uložit jako…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Zrušit"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Uložit"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Zrušit"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Soubory obrázků"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Všechny soubory"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (vícestránkový dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (bezeztrátový)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (komprimovaný)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Formát souboru:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Komprimace:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Soubor s názvem „%s“ již existuje. Chcete jej nahradit?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "Nah_radit"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Ukládá se"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Uložení souboru selhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Pokud dokument neuložíte, změny budou nenávratně ztraceny."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Uložit stávající dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Zahodit změny"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Kontaktuje se skener…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Nezdařilo se uložit obrázek pro náhled"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Nelze otevřít aplikaci s náhledem obrázku"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Přeskupení stránek"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Kombinovat strany"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Kombinovat strany (obráceně)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Obrátit"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Zachovat beze změn"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Nelze otevřít soubor s nápovědou"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -557,16 +510,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -585,22 +538,22 @@ msgstr ""
 "  Marek Černocký <marek@manet.cz>"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Uložit dokument před ukončením?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Vypadá to, že máte skener Brother"
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -609,12 +562,12 @@ msgstr ""
 "výrobce</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Vypadá to, že máte skener Samsung"
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -623,17 +576,17 @@ msgstr ""
 "výrobce</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Vypadá to, že máte skener HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Vypadá to, že máte skener Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -642,38 +595,38 @@ msgstr ""
 "a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Instalace ovladačů"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Po instlaci je potřeba Jednoduché skenování restartovat"
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Instalují se ovladače…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Instalace ovladačů byla úspěšná!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Instalace ovladačů selhala (kód chyby %d)"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Instalace ovladačů se nezdařila."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -681,71 +634,72 @@ msgstr[0] "Je potřeba nainstalovat balíček %s."
 msgstr[1] "Je potřeba nainstalovat balíčky %s."
 msgstr[2] "Je potřeba nainstalovat balíčky %s."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "E-mail"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Přeskupit stránky"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "O aplikaci"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Spustit znovu…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Oříznout vybranou stránku"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Smazat vybranou stránku"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Zrušit"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Autorizovat"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Uživatelské jméno pro zdroj:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Heslo:"
 
@@ -840,146 +794,146 @@ msgid "Copy current page to clipboard"
 msgstr "Zkopírovat aktuální stránku do schránky"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Skener"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Skenovat strany"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Velikost stránky:"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Přední"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Zadní"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Obě"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Prodleva"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Více ručně podávaných stránek"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "sekund"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Skenování"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Rozlišení _textu"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Rozlišení _fotografie"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Jas"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kvalita"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Tmavší"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Světlejší"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Menší"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Větší"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (výchozí)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (náčrt)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlišení)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -995,12 +949,12 @@ msgid "Unable to connect to scanner"
 msgstr "Nelze navázat spojení se skenerem"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Nelze zahájit skenování"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Při komunikaci se skenerem došlo k chybě"
 
@@ -1019,22 +973,22 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Opravit soubory PDF vygenerovaných starší verzí Jednoduchého skenování"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Skenování selhalo"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Skenování probíhá"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[ZAŘÍZENÍ…] — Nástroj pro skenování"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 26e9104..b923b5c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\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-09-02 23:27+0200\n"
+"POT-Creation-Date: 2019-03-24 19:13+0000\n"
+"PO-Revision-Date: 2019-04-07 03:10+0200\n"
 "Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
 "Language: da\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.0.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -83,7 +83,8 @@ msgstr "Opløsning for tekstskan"
 
 #: data/org.gnome.SimpleScan.gschema.xml:46
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Opløsningen i punkter per tomme der skal bruges til skanning af tekst."
+msgstr ""
+"Opløsningen i punkter per tomme der skal bruges til skanning af tekst."
 
 #: data/org.gnome.SimpleScan.gschema.xml:50
 msgid "Resolution for photo scans"
@@ -132,7 +133,7 @@ msgstr "Forsinkelse i millisekunder mellem 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
+#: src/app-window.ui:181 src/app-window.vala:1266 src/app-window.vala:1520
 msgid "Simple Scan"
 msgstr "Simpel skanning"
 
@@ -167,211 +168,152 @@ msgstr "Dokumentskanner"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;skan;skanner;"
 
-#. 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 "_Enkelt 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 arkføderen"
-
-#. 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 glaspladen"
-
-#: 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 "Billede"
-
-#. 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_an"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Stop 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 "Sortér sider påny"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-mail"
-
-#. 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:10
 msgid "Rotate _Left"
 msgstr "Rotér mod _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Rotér mod _højre"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Beskær"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Brugertilpasset"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Rotér beskæring"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Flyt til højre"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Hjælp"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Indhold"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Stop"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Skan en enkelt side fra skanneren"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Stop den igangværende skanning"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Skan"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Skan en enkelt side fra skanneren"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Gem skanningen som en fil"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Gem"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Enkelt side"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Stop den igangværende skanning"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "_Alle sider fra arkføderen"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Stop"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Flere sider fra glaspladen"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Søger efter skannere …"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Tekst"
+
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Billede"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:221 src/app-window.vala:1353
 msgid "_Close"
 msgstr "_Luk"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:230
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Brugernavn og adgangskode er krævet for at tilgå “%s”"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:246
+msgid "Searching for Scanners…"
+msgstr "Søger efter skannere …"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:252
 msgid "Ready to Scan"
 msgstr "Klar til at skanne"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:259
 msgid "Additional software needed"
 msgstr "Yderligere software påkrævet"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:261
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -380,150 +322,156 @@ msgstr ""
 "til din skanner."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:267
 msgid "No scanners detected"
 msgstr "Ingen skannere fundet"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:269
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollér venligst at skanneren er tændt og sluttet til"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:292
 msgid "Save As…"
 msgstr "Gem som …"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Annullér"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:295 src/app-window.vala:549
 msgid "_Save"
 msgstr "_Gem"
 
+#: src/app-window.vala:296 src/app-window.vala:464 src/app-window.vala:548
+msgid "_Cancel"
+msgstr "_Annullér"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:303
 msgid "Scanned Document.pdf"
 msgstr "Skannet dokument.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:309
 msgid "Image Files"
 msgstr "Billedfiler"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:319
 msgid "All Files"
 msgstr "Alle filer"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:328
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidet dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:334
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimeret)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:340
 msgid "PNG (lossless)"
 msgstr "PNG (tabsfri)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:347
 msgid "WebP (compressed)"
 msgstr "WebP (komprimeret)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:357
 msgid "File format:"
 msgstr "Filformat:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:369
 msgid "Compression:"
 msgstr "Komprimering:"
 
 #. 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:463
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Filen “%s” findes 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:466
 msgid "_Replace"
 msgstr "E_rstat"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:505
 msgid "Saving"
 msgstr "Gemmer"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Kunne ikke gemme filen"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:546
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Hvis du ikke gemmer, vil ændringerne være tabt for altid."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:582
 msgid "Save current document?"
 msgstr "Gem det nuværende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:584
 msgid "Discard Changes"
 msgstr "Kassér ændringer"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:717
 msgid "Contacting scanner…"
 msgstr "Kontakter skanneren …"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Kan ikke gemme billedet til forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Kan ikke åbne programmet til forhåndsvisning af billeder"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:974
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Sortér sider på ny"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:997
 msgid "Combine sides"
 msgstr "Kombinér sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1007
 msgid "Combine sides (reverse)"
 msgstr "Kombinér sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1017
 msgid "Reverse"
 msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1027
 msgid "Keep unchanged"
 msgstr "Bevar uændret"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1241
 msgid "Unable to open help file"
 msgstr "Kunne ikke åbne hjælpefilen"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1256
 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 +500,16 @@ msgstr ""
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1259 src/app-window.vala:1541
 msgid "About Simple Scan"
 msgstr "Om Simpel skanning"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1262
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokumentskanningsværktøj"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1271
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -576,169 +524,174 @@ msgstr ""
 "  Niels Kjøller Hansen https://launchpad.net/~kjoller\n"
 "  TLE https://launchpad.net/~k-nielsen81\n"
 "  Torben Gundtofte-Bruun https://launchpad.net/~torbengb\n"
-"  Alan Mortensen https://launchpad.net/~alanmortensen-am"
+"  Alan Mortensen https://launchpad.net/~alanmortensen-am\n"
+"\n"
+"Dansk-gruppen\n"
+"Websted http://dansk-gruppen.dk\n"
+"E-mail <dansk@dansk-gruppen.dk>"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1287
 msgid "Save document before quitting?"
 msgstr "Gem dokumentet før der afsluttes?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1289
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1330
 msgid "You appear to have a Brother scanner."
 msgstr "Du ser ud til at have en Brother-skanner."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1332
 msgid ""
-"Drivers for this are available on the <a href=\"http://support.brother.com"
-"\">Brother website</a>."
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
-"Drivere til denne kan hentes på <a href=\"http://support.brother.com"
-"\">Brothers websted</a>."
+"Drivere til denne kan hentes på <a "
+"href=\"http://support.brother.com\">Brothers websted</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1336
 msgid "You appear to have a Samsung scanner."
 msgstr "Du ser ud til at have en Samsung-skanner."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1338
 msgid ""
-"Drivers for this are available on the <a href=\"http://samsung.com/support"
-"\">Samsung website</a>."
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
-"Drivere til denne kan hentes på <a href=\"http://samsung.com/support"
-"\">Samsungs websted</a>."
+"Drivere til denne kan hentes på <a "
+"href=\"http://samsung.com/support\">Samsungs websted</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1342
 msgid "You appear to have an HP scanner."
 msgstr "Du ser ud til at have en HP-skanner."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1347
 msgid "You appear to have an Epson scanner."
 msgstr "Du ser ud til at have en Epson-skanner."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1349
 msgid ""
-"Drivers for this are available on the <a href=\"http://support.epson.com"
-"\">Epson website</a>."
+"Drivers for this are available on the <a "
+"href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 "Drivere til denne kan hentes på <a href=\"http://support.epson.com\">Epsons "
 "websted</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1353
 msgid "Install drivers"
 msgstr "Installér drivere"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1386
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Når de er installeret, skal du genstarte Simpel skanning."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1399
 msgid "Installing drivers…"
 msgstr "Installerer drivere …"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1407
 msgid "Drivers installed successfully!"
 msgstr "Driverne blev installeret!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1417
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Installation af drivere mislykkedes (fejlkode %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1423
 msgid "Failed to install drivers."
 msgstr "Installation af drivere mislykkedes."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1430
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Det er nødvendigt at installere pakken %s."
 msgstr[1] "Det er nødvendigt at installere pakkerne %s."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1534
 msgid "Email"
 msgstr "E-mail"
 
+#: src/app-window.vala:1535
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Sortér sider på ny"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1538 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1539
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturgenveje"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1540
 msgid "Help"
 msgstr "Hjælp"
 
-#: 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:1549
 msgid "Start Again…"
 msgstr "Start igen …"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1568
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotér siden mod venstre (mod uret)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1577
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotér siden mod højre (med uret)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1589
 msgid "Crop the selected page"
 msgstr "Beskær den markerede side"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1607
 msgid "Delete the selected page"
 msgstr "Slet den markerede side"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1751
 msgid "Cancel"
 msgstr "Annullér"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "A_utorisér"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Brugernavn til ressourcen:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Adgangskode:"
 
@@ -833,146 +786,146 @@ msgid "Copy current page to clipboard"
 msgstr "Kopiér den aktuelle side til udklipsholderen"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Skanner"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Skan sider"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Sidestørrelse"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 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:163
 msgid "Back"
 msgstr "Bagside"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Begge"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Forsinkelse"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Flere sider fra glaspladen"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Sekunder"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Skanning"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Tekstopløsning"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Billedopløsning"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Lysstyrke"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kvalitet"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Mørkere"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Lysere"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Mindre"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Mere"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, 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:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høj opløsning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -988,12 +941,12 @@ msgid "Unable to connect to scanner"
 msgstr "Kan ikke forbinde til sḱanneren"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Kan ikke starte skanningen"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Fejl under kommunikation med skanneren"
 
@@ -1034,6 +987,39 @@ msgstr ""
 "Kør “%s --help” for at se den fulde liste af tilgængelige "
 "kommandolinjetilvalg."
 
+#~ msgid "scanner"
+#~ msgstr "scanner"
+
+#~ msgid "Photo"
+#~ msgstr "Billede"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokument"
+
+#~ msgid "Sc_an"
+#~ msgstr "Sk_an"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Stop skanning"
+
+#~ msgid "_Email"
+#~ msgstr "_E-mail"
+
+#~ msgid "_Page"
+#~ msgstr "_Side"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjælp"
+
+#~ msgid "_Contents"
+#~ msgstr "_Indhold"
+
+#~ msgid "Save"
+#~ msgstr "Gem"
+
+#~ msgid "About"
+#~ msgstr "Om"
+
 #~ msgid "Quit"
 #~ msgstr "Afslut"
 
@@ -1098,13 +1084,11 @@ msgstr ""
 #~ msgstr "Skanneretning"
 
 #~ 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'"
+#~ "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 ""
-#~ "Retningen af skanneren på tværs af siden der skannes. Den kan være én af "
-#~ "de følgende: “top-to-bottom” “bottom-to-top” “left-to-right” “right-to-"
-#~ "left”"
+#~ "Retningen af skanneren på tværs af siden der skannes. Den kan være én af de "
+#~ "følgende: “top-to-bottom” “bottom-to-top” “left-to-right” “right-to-left”"
 
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Højde af skannet billede i pixel"
@@ -1124,16 +1108,16 @@ msgstr ""
 
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
+#~ "photos. This setting decides on the scan resolution, colors and "
+#~ "post-processing."
 #~ msgstr ""
 #~ "Type af dokument der skannes. “text” for tekst dokumenter, “photo” for "
-#~ "billeder. Denne indstilling træffer valget for skanningsopløsning, farver "
-#~ "og efterbehandling."
+#~ "billeder. Denne indstilling træffer valget for skanningsopløsning, farver og "
+#~ "efterbehandling."
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
 #~ msgstr ""
 #~ "Bredden af skannede billede i pixel. Denne værdi opdateres svarende til "
 #~ "sidste skannede side."
@@ -1188,8 +1172,7 @@ msgstr ""
 #~ "  --g-fatal-warnings              Gør alle advarsler fatale"
 
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' "
-#~ "'back'"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Papirside der skal skannes. Den kan være følgende: 'both' 'front' 'back'"
 
@@ -1201,3 +1184,4 @@ msgstr ""
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skannerens retning hen over siden."
+
diff --git a/po/de.po b/po/de.po
index 65c7793..77f5d42 100644
--- a/po/de.po
+++ b/po/de.po
@@ -46,13 +46,14 @@
 # tlue https://launchpad.net/~tlueber"
 #
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2017.
+# Tim Sabsch <tim@sabsch.com>, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-07-26 16:40+0200\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-17 19:10+0100\n"
 "Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -60,7 +61,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.0.9\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -177,7 +178,7 @@ msgstr "Verzögerung zwischen Seiten in Millisekunden."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -218,361 +219,313 @@ msgstr "scan;einlesen;scanner;Flachbett;flatbed;AVW;Vorlagenwechsler;adf;"
 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 "_Einzelne Seite"
-
-#. 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 Seiten aus dem _Papiereinzug"
-
-#. 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 "_Mehrere Seiten aus Flachbett"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Text"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Foto"
-
-#. 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 "Sc_annen"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Scanvorgang anhalten"
-
-#. 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 "Seiten umsortieren"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-Mail"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Seite"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "_Links herum drehen"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "_Rechts herum drehen"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Zuschneiden"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Nicht zuschneiden"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6 Zoll"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "Zuschneideauswahl _drehen"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Nach links schieben"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Nach rechts schieben"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Hilfe"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "I_nhalt"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Anhalten"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Eine einzelne Seite vom Scanner einscannen"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Aktuellen Scanvorgang unterbrechen"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Scannen"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Eine einzelne Seite vom Scanner einscannen"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Dokument als Datei speichern"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Speichern"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Einzelne Seite"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Aktuellen Scanvorgang unterbrechen"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Alle Seiten aus dem _Papiereinzug"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Anhalten"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Mehrere Seiten aus Flachbett"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Nach Scannern wird gesucht …"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Text"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Bild"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "S_chließen"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr ""
 "Für den Zugriff auf »%s« werden ein Benutzername und ein Passwort benötigt"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Nach Scannern wird gesucht …"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Bereit zum Scannen"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Zusätzliche Software wird benötigt"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
 msgstr ""
-"Sie müssen die <a href=\"install-firmware\">Treibersoftware</a für Ihren "
+"Sie müssen die <a href=\"install-firmware\">Treibersoftware</a> für Ihren "
 "Scanner installieren."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Kein Scanner gefunden"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Bitte überprüfen Sie, ob Ihr Scanner angeschlossen und eingeschaltet ist"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Speichern unter …"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "Abbre_chen"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Speichern"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "Abbre_chen"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Gescanntes Dokument.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Bilddateien"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (Mehrseitiges Dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (Verlustbehaftet)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (Verlustfrei)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (komprimiert)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Dateiformat:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Kompression:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Eine Datei namens »%s« existiert bereits. Möchten Sie diese ersetzen?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Wird gespeichert"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Datei konnte nicht gespeichert werden"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr ""
 "Wenn Sie nicht speichern, werden die Änderungen unwiderruflich verworfen."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Aktuelles Dokument speichern?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Änderungen verwerfen"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Scanner wird kontaktiert …"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Vorschaubild kann nicht gespeichert werden"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Seiten umsortieren"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Seiten zusammenfügen"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Seiten zusammenfügen (umgekehrte Reihenfolge)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Vertauschen"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Unverändert lassen"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -606,16 +559,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -662,22 +615,22 @@ msgstr ""
 "  tlue https://launchpad.net/~tlueber"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Dokument vor dem Beenden speichern?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Scheinbar ist ein Brother-Scanner angeschlossen."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -686,12 +639,12 @@ msgstr ""
 "\">Brother Webseite</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Scheinbar ist ein Samsung-Scanner angeschlossen."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -700,17 +653,17 @@ msgstr ""
 "\">Samsung Webseite</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Scheinbar ist ein HP-Scanner angeschlossen."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Scheinbar ist ein Epson-Scanner angeschlossen."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -719,109 +672,110 @@ msgstr ""
 "Webseite</a> verfügbar."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Treiber installieren"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Nach der Installation müssen Sie Simple Scan erneut starten."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Treiber werden installiert …"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Treiber wurden erfolgreich installiert!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Treiberinstallation fehlgeschlagen (Fehlernummer %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Treiberinstallation fehlgeschlagen."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Sie müssen das Paket %s installieren."
 msgstr[1] "Sie müssen die Pakete %s installieren."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "E-Mail"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Seiten umsortieren"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Tastenkombinationen"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Info"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Erneut starten …"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Die Seite links herum drehen (gegen den Uhrzeigersinn)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Die Seite rechts herum drehen (im Uhrzeigersinn)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Die gewählte Seite zurechtschneiden"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Die gewählte Seite löschen"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Legitimieren"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Benutzername für Quelle:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Passwort:"
 
@@ -916,146 +870,146 @@ msgid "Copy current page to clipboard"
 msgstr "Aktuelle Seite in die Zwischenablage kopieren"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Scanner"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Zu scannende Seiten"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Seitengröße"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Vorderseite"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Rückseite"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Beide"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Verzögerung"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Mehrere Seiten aus Flachbett"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Sekunden"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Scannen"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Textauflösung"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Fotoauflösung"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Helligkeit"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Qualität"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Dunkler"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Heller"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Weniger"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Mehr"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (Vorgabe)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (Entwurf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (Hohe Auflösung)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -1071,12 +1025,12 @@ msgid "Unable to connect to scanner"
 msgstr "Verbindung zum Scanner konnte nicht hergestellt werden"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Scanvorgang konnte nicht gestartet werden"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Fehler bei der Kommunikation mit dem Scanner"
 
@@ -1097,27 +1051,57 @@ msgstr ""
 "erstellt wurden"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Scannen fehlgeschlagen"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Scanvorgang läuft"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[GERÄT …] — Scan-Werkzeug"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren "
 "Befehlszeilenoptionen zu erhalten."
 
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokument"
+
+#~ msgid "Sc_an"
+#~ msgstr "Sc_annen"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Scanvorgang anhalten"
+
+#~ msgid "_Email"
+#~ msgstr "_E-Mail"
+
+#~ msgid "_Page"
+#~ msgstr "_Seite"
+
+#~ msgid "_Help"
+#~ msgstr "_Hilfe"
+
+#~ msgid "_Contents"
+#~ msgstr "I_nhalt"
+
+#~ msgid "Save"
+#~ msgstr "Speichern"
+
+#~ msgid "About"
+#~ msgstr "Info"
+
 #~ msgid "Quit"
 #~ msgstr "Beenden"
diff --git a/po/el.po b/po/el.po
index ee646c0..c0a6511 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan:el\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-08-14 00:34+0300\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-17 02:34+0200\n"
 "Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
 "Language: el\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.0.9\n"
+"X-Generator: Poedit 1.5.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -138,7 +138,7 @@ msgstr "Καθυστέρηση ανάμεσα στις σελίδες, σε χι
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Σάρωση"
 
@@ -178,207 +178,152 @@ msgstr "scan;scanner;flatbed;adf;σάρωση;σαρωτής;"
 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 "Μια_σελίδα"
-
-#. 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 "Όλες τις σελίδες από την _τροφοδοσία"
-
-#. 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 "_Πολλαπλές σελίδες από την επιφάνεια σάρωσης"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "ΚΕΙΜΕΝΟ"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Φωτογραφία"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Έγγραφο"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "_Σάρωση"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Διακοπή σάρωσης"
-
-#. 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 "Επαναδιάταξη σελίδων"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "Ηλ. _αλληλογγραφία"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Σελίδα"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Περιστροφή _αριστερά"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Περιστροφή _δεξιά"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Περικοπή"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Κανένα"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6 ίντσες"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Προσαρμοσμένο"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Περιστροφή περικοπής"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Μετακίνηση αριστερά"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Μετακίνηση δεξιά"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Βοήθεια"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Περιεχόμενα"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Διακοπή"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Σάρωση μίας σελίδας από τον σαρωτή"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Διακοπή τρέχουσας σάρωσης"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Σάρωση"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Σάρωση μίας σελίδας από τον σαρωτή"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Αποθήκευση"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Μονή σελίδα"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Διακοπή τρέχουσας σάρωσης"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Όλες τις σελίδες από την _τροφοδοσία"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Διακοπή"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Πολλαπλές σελίδες από την επιφάνεια σάρωσης"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Αναζήτηση για σαρωτές…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Κείμενο"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Εικόνα"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο «%s»"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Αναζήτηση για σαρωτές…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Έτοιμο για σάρωση"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Απαιτείται επιπρόσθετο λογισμικό"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -387,152 +332,159 @@ msgstr ""
 "για τον σαρωτή σας."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Δεν ανιχνεύθηκαν σαρωτές"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Παρακαλούμε βεβαιωθείτε ότι ο σαρωτής σας είναι συνδεδεμένος και σε "
 "λειτουργία"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Αποθήκευση ως…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Ακύρωση"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "Απο_θήκευση"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Ακύρωση"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Σαρωμένο.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (συμπιεσμένο)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (δίχως συμπίεση)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (συμπιεσμένο)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Τύπος αρχείου:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Συμπίεση:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Υπάρχει ήδη αρχείο με το όνομα «%s». Θέλετε να αντικατασταθεί;"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Γίνεται αποθήκευση…"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Αποτυχία αποθήκευσης του αρχείου"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Αν δεν αποθηκεύσετε, οι αλλαγές θα χαθούν μόνιμα."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Αποθήκευση του τρέχοντος εγγράφου;"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Απόρριψη αλλαγών"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Αναζήτηση σαρωτή…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Αδυναμία αποθήκευσης σελίδας για προεπισκόπηση"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+#| msgid "Reorder Pages"
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Επαναδιάταξη σελίδων"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Συνδυασμός πλευρών"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Συνδυασμός πλευρών (αντιστροφή)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Αντιστροφή"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Διατήρηση αμετάβλητων"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -564,16 +516,16 @@ msgstr ""
 "εδώ: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -594,22 +546,22 @@ msgstr ""
 "  trix https://launchpad.net/~panelc"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Έξοδος χωρίς αποθήκευση"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Φαίνεται να έχετε έναν σαρωτή Brother"
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -618,12 +570,12 @@ msgstr ""
 "com\">ιστότοπο της Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Φαίνεται να έχετε έναν σαρωτή Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -632,17 +584,17 @@ msgstr ""
 "support\">ιστότοπο της Samsung </a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Φαίνεται να έχετε έναν σαρωτή HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Φαίνεται να έχετε έναν σαρωτή Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -651,109 +603,111 @@ msgstr ""
 "\">ιστότοπο της Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Εγκατάσταση οδηγών"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Όταν εγκατασταθούν θα πρέπει να γίνει επανεκκίνηση του Simple Scan."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Εγκαθίστανται οι οδηγοί…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Οι οδηγοί εγκαταστάθηκαν επιτυχώς!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Αποτυχία εγκατάστσης οδηγών (κωδικός σφάλματος %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Αποτυχία εγκατάστασης οδηγών."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Χρειάζεται να εγκαταστήσετε το %s πακέτο."
 msgstr[1] "Χρειάζεται να εγκαταστήσετε τα %s πακέτα."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "Ηλεκτρονική αλληλογραφία"
 
+#: src/app-window.vala:1534
+#| msgid "Reorder Pages"
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Επαναδιάταξη σελίδων"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Συντομεύσεις πληκτρολογίου"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Περί"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Εκκίνηση πάλι…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Περιστροφή της σελίδας αριστερά"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Περιστροφή της σελίδας δεξιά"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Περικοπή της επιλεγμένης σελίδας"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Διαγραφή της επιλεγμένης σελίδας"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Ακύρωση"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Εξουσιοδότηση"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Όνομα _χρήστη για πόρο:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Κωδικός:"
 
@@ -848,146 +802,146 @@ msgid "Copy current page to clipboard"
 msgstr "Αντιγραφή της τρέχουσας σελίδας στο παρασκήνιο"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Σαρωτής"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Πλευρές σάρωσης"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Μέγεθος σελίδας"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Πρόσοψη"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Πίσω όψη"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Μπρος - πίσω"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Καθυστέρηση"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Πολλαπλές σελίδες από την επιφάνεια σάρωσης"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Δευτερόλεπτα"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Σάρωση"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Ανάλυση _κειμένου"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Ανάλυση _φωτογραφίας"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Φωτεινότητα"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Αντίθεση"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Ποιότητα"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Αυτόματο"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Σκοτεινότερο"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Φωτεινότερο"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Λιγότερο"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Περισσότερο"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (υψηλή ανάλυση)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -1003,12 +957,12 @@ msgid "Unable to connect to scanner"
 msgstr "Αδύνατη η σύνδεση με τον σαρωτή"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Αδύνατη η εκκίνηση της σάρωσης"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Σφάλμα κατά την επικοινωνία με τον σαρωτή"
 
@@ -1029,28 +983,58 @@ msgstr ""
 "λογισμικού Simple Scan"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Η σάρωση απέτυχε"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Γίνεται σάρωση"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[ΣΥΣΚΕΥΗ…] — Εργαλείο σάρωσης"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Εκτελέστε «%s --help» για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
 "της γραμμής εντολών."
 
+#~ msgid "Photo"
+#~ msgstr "Φωτογραφία"
+
+#~ msgid "_Document"
+#~ msgstr "_Έγγραφο"
+
+#~ msgid "Sc_an"
+#~ msgstr "_Σάρωση"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Διακοπή σάρωσης"
+
+#~ msgid "_Email"
+#~ msgstr "Ηλ. _αλληλογγραφία"
+
+#~ msgid "_Page"
+#~ msgstr "_Σελίδα"
+
+#~ msgid "_Help"
+#~ msgstr "_Βοήθεια"
+
+#~ msgid "_Contents"
+#~ msgstr "_Περιεχόμενα"
+
+#~ msgid "Save"
+#~ msgstr "Αποθήκευση"
+
+#~ msgid "About"
+#~ msgstr "Περί"
+
 #~ msgid "Quit"
 #~ msgstr "'Εξοδος"
 
diff --git a/po/eo.po b/po/eo.po
index a38b61b..66c05fa 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,13 +5,13 @@
 # Tiffany ANTOPOLSKI <tiffany.antopolski@gmail.com>, 2011.
 # Manuel ORTEGA <manuel@grupolasindias.coop>, 2015.
 # Sébastien ZURFLUH <sebastien.zurfluh@gmail.com>, 2017.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2017.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2017-12-11 02:03+0000\n"
-"PO-Revision-Date: 2017-12-19 23:09+0200\n"
+"POT-Creation-Date: 2018-09-25 08:41+0000\n"
+"PO-Revision-Date: 2018-09-30 11:55+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
 "Language-Team: Esperanto <gnome-eo-list@gnome.org>\n"
 "Language: eo\n"
@@ -135,7 +135,7 @@ msgstr "Malfruo en milisekundoj inter paĝoj."
 #. 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:1560
+#: src/app-window.ui:181 src/app-window.vala:1522
 msgid "Simple Scan"
 msgstr "Simpla skano"
 
@@ -174,201 +174,152 @@ msgstr "skani;skanilo;plata;adf;"
 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:820
-msgid "Single _Page"
-msgstr "_Unuopa paĝo"
-
-#. 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:829
-msgid "All Pages From _Feeder"
-msgstr "Ĉiuj paĝoj el _papero-metilo"
-
-#. 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:838
-msgid "_Multiple Pages From Flatbed"
-msgstr "_Pluraj paĝoj el plato"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
-msgid "Text"
-msgstr "Teksto"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
-msgid "Photo"
-msgstr "Foto"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Dokumento"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Sk_ani"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "Haltigi _skani"
-
-#. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
-msgid "Reorder Pages"
-msgstr "Reordigi paĝojn"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "R_etpoŝti"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Paĝo"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Turni _maldekstren"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Turni _dekstren"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "Stu_ci"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Neniu"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
+#. Radio button for cropping page to A3
+#: src/app-window.ui:106
+msgid "A_3"
+msgstr "A_3"
+
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:397
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Propre"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:415
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Turni la stoco-lokon"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:428
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Movi maldekstren"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:437
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Movi dekstren"
 
-#. Label on help menu
-#: src/app-window.ui:474
-msgid "_Help"
-msgstr "_Helpo"
-
-#. Help|Contents menu
-#: src/app-window.ui:482
-msgid "_Contents"
-msgstr "_Enhavo"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Haltigi"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:520 src/app-window.ui:720
-msgid "Scan a single page from the scanner"
-msgstr "Skani unuopan paĝon el la skanilo"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Haltigi la aktualan skanon"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:522 src/app-window.ui:716
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Skani"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Skani unuopan paĝon el la skanilo"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:538 src/app-window.ui:787
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Konservi dokumenton en dosiero"
 
-#: src/app-window.ui:540
-msgid "Save"
-msgstr "Konservi"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Unuopa paĝo"
 
-#. Tooltip for stop button
-#: src/app-window.ui:555 src/app-window.ui:700
-msgid "Stop the current scan"
-msgstr "Haltigi la aktualan skanon"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Ĉiuj paĝoj el _papero-metilo"
 
-#: src/app-window.ui:556 src/app-window.ui:697
-msgid "Stop"
-msgstr "Haltigi"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Pluraj paĝoj el plato"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:611
-msgid "Searching for Scanners…"
-msgstr "Serĉante skanilojn…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Teksto"
 
-#: src/app-window.vala:237 src/app-window.vala:1380
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Bildo"
+
+#: src/app-window.vala:223 src/app-window.vala:1353
 msgid "_Close"
 msgstr "_Fermi"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:246
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Salutnomo kaj pasvorto necesas por aliri “%s”"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Serĉante skanilojn…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:266 src/app-window.vala:584
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Pretas skani"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:273
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Plua programo bezonatas"
 
 #. Instructions to install driver software
-#: src/app-window.vala:275
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -377,110 +328,110 @@ msgstr ""
 "skanilo."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:281
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Neniuj skaniloj eltrovis"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:283
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Bonvolu kontrolas ke via skanilo estas kenekta kaj kurentŝalta"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:298
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Konservi kiel…"
 
-#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+#: src/app-window.vala:297 src/app-window.vala:467 src/app-window.vala:548
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: src/app-window.vala:302 src/app-window.vala:553
+#: src/app-window.vala:298 src/app-window.vala:549
 msgid "_Save"
 msgstr "Kon_servi"
 
 #. Default filename to use when saving document
-#: src/app-window.vala:310
+#: src/app-window.vala:306
 msgid "Scanned Document.pdf"
 msgstr "Skanita Dokumento.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:316
+#: src/app-window.vala:312
 msgid "Image Files"
 msgstr "Bildo-dosieroj"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:326
+#: src/app-window.vala:322
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:335
+#: src/app-window.vala:331
 msgid "PDF (multi-page document)"
 msgstr "PDF (multpaĝa dokumento)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:341
+#: src/app-window.vala:337
 msgid "JPEG (compressed)"
 msgstr "JPEG (densigita)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:347
+#: src/app-window.vala:343
 msgid "PNG (lossless)"
 msgstr "PNG (senperda)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:354
+#: src/app-window.vala:350
 msgid "WebP (compressed)"
 msgstr "WebP (densigita)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:364
+#: src/app-window.vala:360
 msgid "File format:"
 msgstr "Dosiertipo:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:376
+#: src/app-window.vala:372
 msgid "Compression:"
 msgstr "Densigo:"
 
 #. 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:470
+#: src/app-window.vala:466
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "La dosiero nomata  “%s” jam ekzistas. Ĉu vi volas anstataŭigi ĝin?"
 
 #. 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:473
+#: src/app-window.vala:469
 msgid "_Replace"
 msgstr "_Anstataŭigi"
 
-#: src/app-window.vala:512
+#: src/app-window.vala:508
 msgid "Saving"
 msgstr "Konservi"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:527
+#: src/app-window.vala:523
 msgid "Failed to save file"
 msgstr "Ne sukcesis konservi la dosieron"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:550
+#: src/app-window.vala:546
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Se vi ne konservas, ŝanĝoj estos perditaj permanente."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:591
+#: src/app-window.vala:582
 msgid "Save current document?"
 msgstr "Konservi la nunan dokumenton?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:593
+#: src/app-window.vala:584
 msgid "Discard Changes"
 msgstr "Forlasi Ŝanĝojn"
 
 #. Label shown when scan started
-#: src/app-window.vala:692
+#: src/app-window.vala:717
 msgid "Contacting scanner…"
 msgstr "Kontaktante skanilon…"
 
@@ -494,33 +445,38 @@ msgstr "Ne eblas konservi bildon por antaŭrigardo"
 msgid "Unable to open image preview application"
 msgstr "Ne eblis malfermi bild-dosieron"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:974 src/app-window.vala:1537
+msgid "Reorder Pages"
+msgstr "Reordigi paĝojn"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:990
+#: src/app-window.vala:997
 msgid "Combine sides"
 msgstr "Kombini flankojn"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1000
+#: src/app-window.vala:1007
 msgid "Combine sides (reverse)"
 msgstr "Kombini flankojn (inverse)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1010
+#: src/app-window.vala:1017
 msgid "Reverse"
 msgstr "Inversigi"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1020
+#: src/app-window.vala:1027
 msgid "Keep unchanged"
 msgstr "Konservi senŝanĝa"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1250
+#: src/app-window.vala:1241
 msgid "Unable to open help file"
 msgstr "Ne eblis malfermi help-dosieron"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1271
+#: src/app-window.vala:1256
 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"
@@ -537,8 +493,8 @@ msgid ""
 msgstr ""
 "Ĉi tiu verko estas libera programo; vi povas ĝin pludistribui kaj/aŭ modifi\n"
 "je la  kondiĉoj  de la Ĝenerala Publika Permesilo de GNU, eldonita de\n"
-"Free Software Foundation, laŭ versio 3 de tiu Permesilo aŭ,\n"
-"se vi preferas, ajna posta versio.\n"
+"Free Software Foundation, laŭ versio 3 de tiu Permesilo aŭ \n"
+"(se vi preferas) ajna posta versio.\n"
 "\n"
 "Ni distribuas ĉi tiun programon esperante ke ĝi estos utila,\n"
 "tamen SEN IA AJN GARANTIO;  i.a. sen la implica garantio pri\n"
@@ -550,16 +506,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1274
+#: src/app-window.vala:1259
 msgid "About Simple Scan"
 msgstr "Pri simpla skani"
 
 #. Description of program
-#: src/app-window.vala:1277
+#: src/app-window.vala:1262
 msgid "Simple document scanning tool"
 msgstr "Simpla skanilo de dokumento"
 
-#: src/app-window.vala:1286
+#: src/app-window.vala:1271
 msgid "translator-credits"
 msgstr ""
 "Donald ROGERS, Kristjan SCHMIDT, Leo ARIAS, Manuel ORTEGA, Michael MORONI, "
@@ -567,55 +523,55 @@ msgstr ""
 "(Sezuo) ZURFLUH"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1308
+#: src/app-window.vala:1287
 msgid "Save document before quitting?"
 msgstr "Konservi dokumenton antaŭe ĉesanta?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1310
+#: src/app-window.vala:1289
 msgid "Quit without Saving"
 msgstr "Fini sen konservanta"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1357
+#: src/app-window.vala:1330
 msgid "You appear to have a Brother scanner."
 msgstr "Ŝajnas ke vi havas skanilon de Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1359
+#: src/app-window.vala:1332
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
 msgstr ""
-"Peliloj por ĉi tiu disponeblas ĉe la <a href=\"http://support.brother.com"
-"\">retejo de Brother</a>."
+"Peliloj por ĉi tiu disponeblas ĉe la <a href=\"http://support.brother.com\">"
+"retejo de Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1363
+#: src/app-window.vala:1336
 msgid "You appear to have a Samsung scanner."
 msgstr "Ŝajnas ke vi havas skanilon de Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1365
+#: src/app-window.vala:1338
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
 msgstr ""
-"Peliloj por ĉi tiu disponeblas ĉe la <a href=\"http://samsung.com/support"
-"\">retejo de Samsung</a>."
+"Peliloj por ĉi tiu disponeblas ĉe la <a href=\"http://samsung.com/support\">"
+"retejo de Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1369
+#: src/app-window.vala:1342
 msgid "You appear to have an HP scanner."
 msgstr "Ŝajnas ke vi havas skanilon de HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1347
 msgid "You appear to have an Epson scanner."
 msgstr "Ŝajnas ke vi havas skanilon de Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1349
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -624,114 +580,109 @@ msgstr ""
 "\">retejo de Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1380
+#: src/app-window.vala:1353
 msgid "Install drivers"
 msgstr "Instali pelilojn"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1411
+#: src/app-window.vala:1386
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Kiam instalita, tiam vi bezonos restarti na Simpla Skano."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1423
+#: src/app-window.vala:1399
 msgid "Installing drivers…"
 msgstr "Instalante pelilojn…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1431
+#: src/app-window.vala:1407
 msgid "Drivers installed successfully!"
 msgstr "Sukcese instalis pelilojn!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1441
+#: src/app-window.vala:1417
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Malsukcesis instali pelilojn (erar-kodo %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1447
+#: src/app-window.vala:1423
 msgid "Failed to install drivers."
 msgstr "Malsukcesis instali pelilojn."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1454
+#: src/app-window.vala:1430
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Vi bezonas instali la pakaĵon %s."
 msgstr[1] "Vi bezonas instali la pakaĵojn %s."
 
+#: src/app-window.vala:1536
+msgid "Email"
+msgstr "Retpoŝti"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1568 src/app-window.vala:1591
-#: src/preferences-dialog.ui:53
+#: src/app-window.vala:1540 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Agordoj"
 
-#: src/app-window.vala:1572
+#: src/app-window.vala:1541
 msgid "Keyboard Shortcuts"
 msgstr "Fulmoklavoj"
 
-#: src/app-window.vala:1573
+#: src/app-window.vala:1542
 msgid "Help"
 msgstr "Helpo"
 
-#: src/app-window.vala:1574
+#: src/app-window.vala:1543
 msgid "About"
 msgstr "Pri"
 
-#: src/app-window.vala:1575
-msgid "Quit"
-msgstr "Ĉesi"
-
-#: src/app-window.vala:1589
-msgid "Email"
-msgstr "Retpoŝti"
-
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1599
+#: src/app-window.vala:1551
 msgid "Start Again…"
 msgstr "Starti denove…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1616
+#: src/app-window.vala:1570
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Turni la paĝon maldekstren (maldekstrume)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1623
+#: src/app-window.vala:1579
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Turni la paĝon dekstren (dekstrume)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1633
+#: src/app-window.vala:1591
 msgid "Crop the selected page"
 msgstr "Stuci la elektitan paĝon"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1649
+#: src/app-window.vala:1609
 msgid "Delete the selected page"
 msgstr "Forigi la elektitan paĝon"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1814
+#: src/app-window.vala:1753
 msgid "Cancel"
 msgstr "Nuligi"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "R_ajtigi"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Sal_utnomo por risurco:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
@@ -826,146 +777,146 @@ msgid "Copy current page to clipboard"
 msgstr "Kopii la nunan paĝon al poŝo"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Skanilo"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Skana flanko"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Paĝo-dimensio"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Antaŭo"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Dorso"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Ambaŭ"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Malfrui de"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Pluraj paĝoj el plato"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Sekundoj"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Skanado"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Teksta distingivo"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Fotaĵa distingivo"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Heleco"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrasto"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kvalito"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: src/preferences-dialog.vala:116
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Pli malhele"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Pli hele"
 
-#: src/preferences-dialog.vala:126
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Malpli"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Pli"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:440
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d punktoj en colo (defaŭlto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:443
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d punktoj en colo (malneto)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:446
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d punktoj en colo (alta distingivo)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:449
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d punktoj en colo"
@@ -986,7 +937,7 @@ msgid "Unable to start scan"
 msgstr "Ne povas komenci skani"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1340
+#: src/scanner.vala:1240 src/scanner.vala:1347
 msgid "Error communicating with scanner"
 msgstr "Eraro kiam konektanta kun skanilo"
 
@@ -1005,27 +956,57 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Ripari PDF-dosierojn generitajn per antaŭaj versioj de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Ne sukcesi skani"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Nun skanante"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[APARATO…] — Skanutilaĵo"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Lanĉu “%s --help” por vidi plenan liston da disponeblaj komandliniaj opcioj."
 
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokumento"
+
+#~ msgid "Sc_an"
+#~ msgstr "Sk_ani"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "Haltigi _skani"
+
+#~ msgid "_Email"
+#~ msgstr "R_etpoŝti"
+
+#~ msgid "_Page"
+#~ msgstr "_Paĝo"
+
+#~ msgid "_Help"
+#~ msgstr "_Helpo"
+
+#~ msgid "_Contents"
+#~ msgstr "_Enhavo"
+
+#~ msgid "Save"
+#~ msgstr "Konservi"
+
+#~ msgid "Quit"
+#~ msgstr "Ĉesi"
+
 #~ msgid "Front and Back"
 #~ msgstr "Antaŭo kaj malantaŭo"
 
diff --git a/po/es.po b/po/es.po
index cfa3b15..94eb644 100644
--- a/po/es.po
+++ b/po/es.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.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2017, 2018.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2017-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-06-25 22:01+0000\n"
-"PO-Revision-Date: 2018-06-29 13:49+0200\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-11 10:07+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 3.31.90\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -135,7 +135,7 @@ msgstr "Retardo entre páginas, en milisegundos."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -175,207 +175,152 @@ msgstr "escanear;escáner;plano;adf;"
 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 "_Una página"
-
-#. 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 "Todas las páginas del _alimentador"
-
-#. 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 "_Varias páginas del alimentador"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Texto"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Foto"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Documento"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Esc_anear"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "D_etener escaneado"
-
-#. 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:1601
-msgid "Reorder Pages"
-msgstr "Reordenar las páginas"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_Correo electrónico"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Página"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Girar a la i_zquierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Girar a la _derecha"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Ninguno"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "_Oficio"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Girar recorte"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Mover a la izquierda"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Mover a la derecha"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "Ay_uda"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Contenido"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Detener"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Escanear una sola página desde el escáner"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Detiene el escaneado actual"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Escanear"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Escanear una sola página desde el escáner"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Guardar documento a un archivo"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Guardar"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Una página"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Detiene el escaneado actual"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Todas las páginas del _alimentador"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Detener"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Varias páginas del alimentador"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Buscando escáneres…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Texto"
+
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Imagen"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Usuario y contraseña necesarios para acceder a «%s»"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Buscando escáneres…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Listo para escanear"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Se necesita software adicional"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -384,150 +329,157 @@ msgstr ""
 "a> para el escáner."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "No se detectó ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Compruebe que su escáner está encendido y conectado"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Guardar como…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Guardar"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Cancelar"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Archivos de imagen"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Todos los archivos"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multipágina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (sin pérdida)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (comprimido)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Formato de archivo:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Compresión:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Guardando"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Falló al guardar el archivo"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Los cambios se perderán permanentemente si no los guarda."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "¿Guardar el documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Contactando con el escáner…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "No se pudo guardar la imagen para previsualización"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "No se puede abrir la aplicación de previsualización de imágenes"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+#| msgid "Reorder Pages"
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Reordenar las páginas"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (invertido)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Invertir"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Mantener sin cambios"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -558,16 +510,16 @@ msgstr ""
 "vea  <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -598,22 +550,22 @@ msgstr ""
 "  hhlp https://launchpad.net/~hhlp-deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "¿Guardar el documento antes de salir?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Parece que tiene un escáner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -622,12 +574,12 @@ msgstr ""
 "encontrará controladores."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Parece que tiene un escáner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -636,17 +588,17 @@ msgstr ""
 "encontrará controladores."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Parece que tiene un escáner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Parece que tiene un escáner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -655,114 +607,111 @@ msgstr ""
 "encontrar controladores."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Instalación de controladores"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Cuando finalice la instalación deberá reiniciar Simple Scan."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Instalando los controladores…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Los controladores se instalaron correctamente."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Falló la instalación de los controladores (cód. de error: %d)"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Falló la instalación de los controladores."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Necesita instalar el paquete %s."
 msgstr[1] "Necesita instalar los paquetes %s."
 
+#: src/app-window.vala:1533
+msgid "Email"
+msgstr "Correo-e"
+
+#: src/app-window.vala:1534
+#| msgid "Reorder Pages"
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Reordenar las páginas"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1579 src/app-window.vala:1602
-#: src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/app-window.vala:1583
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
-#: src/app-window.vala:1584
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/app-window.vala:1585
-msgid "About"
-msgstr "Acerca de"
-
-#: src/app-window.vala:1586
-msgid "Quit"
-msgstr "Salir"
-
-#: src/app-window.vala:1600
-msgid "Email"
-msgstr "Correo-e"
-
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1610
+#: src/app-window.vala:1548
 msgid "Start Again…"
 msgstr "Empezar de nuevo…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1627
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Girar la página a la izquierda (contrario a las agujas del reloj)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1644
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Recortar la página seleccionada"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1660
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Eliminar la página seleccionada"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1825
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Nombre de _usuario para el recurso:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Contraseña:"
 
@@ -857,146 +806,146 @@ msgid "Copy current page to clipboard"
 msgstr "Copiar la página actual al portapapeles"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Escáner"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Caras que escanear"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Tamaño de página"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Anverso"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Reverso"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Ambas"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Retardo"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Varias páginas del alimentador"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Segundos"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Escaneando"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Resolución del _texto"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Resolución de la _fotografía"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Brillo"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Contraste"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Calidad"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Más oscuro"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Más claro"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Menos"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Más"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
@@ -1012,12 +961,12 @@ msgid "Unable to connect to scanner"
 msgstr "No se pudo conectar al escáner"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Incapaz de iniciar el escaneo"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Error al comunicarse con el escáner"
 
@@ -1037,28 +986,61 @@ msgstr ""
 "Arreglar archivos PDF generados con versiones anteriores de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Falló al escanear"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Escaneado en progreso"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
 "órdenes disponibles."
 
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Documento"
+
+#~ msgid "Sc_an"
+#~ msgstr "Esc_anear"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "D_etener escaneado"
+
+#~ msgid "_Email"
+#~ msgstr "_Correo electrónico"
+
+#~ msgid "_Page"
+#~ msgstr "_Página"
+
+#~ msgid "_Help"
+#~ msgstr "Ay_uda"
+
+#~ msgid "_Contents"
+#~ msgstr "_Contenido"
+
+#~ msgid "Save"
+#~ msgstr "Guardar"
+
+#~ msgid "About"
+#~ msgstr "Acerca de"
+
+#~ msgid "Quit"
+#~ msgstr "Salir"
+
 #~ msgid "Saving document…"
 #~ msgstr "Guardando el documento…"
 
diff --git a/po/fi.po b/po/fi.po
index d362c76..39ccdf4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-08-17 11:06+0300\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-08 21:00+0200\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.0.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -135,7 +135,7 @@ msgstr "Viive millisekunneissa sivujen välillä."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Kuvanluku"
 
@@ -174,207 +174,152 @@ msgstr "kuvanluku;skanneri;scan;scanner;flatbed;adf;"
 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 "Yksi _sivu"
-
-#. 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 "Kaikki sivut _laitteelta"
-
-#. 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 "_Useita sivuja tasokuvanlukijasta"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Teksti"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Valokuva"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Asiakirja"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Lue kuv_a"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "Py_säytä kuvanluku"
-
-#. 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 "Järjestä sivut"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_Sähköposti"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Sivu"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Kierrä _vasemmalle"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Kierrä _oikealle"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Rajaa"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "US Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Muu"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "Kierr_ä rajausta"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Siirrä vasemmalle"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Siirrä oikealle"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "O_hje"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Sisältö"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Pysäytä"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Lue yksi sivu kuvanlukijalta"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Pysäytä kuvan lukeminen"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Lue"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Lue yksi sivu kuvanlukijalta"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Tallenna"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "Yksi _sivu"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Pysäytä kuvan lukeminen"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Kaikki sivut _laitteelta"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Pysäytä"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Useita sivuja tasokuvanlukijasta"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Etsitään kuvanlukijoita…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Teksti"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Kuva"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Sulje"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Käyttäjänimi ja salasana vaaditaan laitteen “%s” käyttämiseksi"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Etsitään kuvanlukijoita…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Valmiina lukemaan"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Lisäohjelmistoja vaaditaan"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -383,150 +328,156 @@ msgstr ""
 "ajuri</a>."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Tallenna nimellä…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Peru"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Tallenna"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Peru"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (monisivuinen asiakirja)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (pakattu)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (häviötön)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (pakattu)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Tiedostomuoto:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Pakkaus:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Tiedosto nimeltä “%s” on jo olemassa. Haluatko korvata sen?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Tallennetaan"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Tiedoston tallennus epäonnistui"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Jos et tallenna, muutokset katoavat pysyvästi."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Tallennetaanko nykyinen asiakirja?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Hylkää muutokset"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Yhdistetään kuvanlukijaan…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Esikatselun tallennus epäonnistui"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Esikatselusovelluksen avaus epäonnistui"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Järjestä sivut"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Yhdistä puolet"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Yhdistä puolet (käänteinen)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Käänteinen"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Säilytä muuttumattomana"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -557,16 +508,16 @@ msgstr ""
 "www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Tietoja sovelluksesta"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Jiri Grönroos\n"
@@ -582,22 +533,22 @@ msgstr ""
 "  Ville Pilvio https://launchpad.net/~vpilvio"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Käytössäsi vaikuttaa olevan Brother-kuvanlukija."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -606,12 +557,12 @@ msgstr ""
 "verkkosivustolta</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Käytössäsi vaikuttaa olevan Samsung-kuvanlukija."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -620,17 +571,17 @@ msgstr ""
 "verkkosivustolta</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Käytössäsi vaikuttaa olevan HP-kuvanlukija."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Käytössäsi vaikuttaa olevan Epson-kuvanlukija."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -639,110 +590,111 @@ msgstr ""
 "verkkosivustolta</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Asenna ajurit"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Kun ajurit on asennettu, kuvanlukusovellus on käynnistettävä uudelleen."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Asennetaan ajureita…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Ajurit asennettiin onnistuneesti!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Ajurien asentaminen epäonnistui (virhekoodi %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Ajurien asentaminen epäonnistui."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "%s paketti/paketit tulee asentaa."
 msgstr[1] "%s paketti/paketit tulee asentaa."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "Sähköposti"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Järjestä sivut"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Pikanäppäimet"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Ohje"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Tietoja"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Aloita uudelleen…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Kierrä sivua vasemmalle (vastapäivään)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Kierrä sivua oikealle (myötäpäivään)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Rajaa nykyistä sivua"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Poista valittu sivu"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Peru"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Valtuuta"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Resurssin _käyttäjänimi:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Salasana:"
 
@@ -837,146 +789,146 @@ msgid "Copy current page to clipboard"
 msgstr "Kopioi nykyinen sivu leikepöydälle"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Kuvanlukija"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Luettava puoli"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Sivun koko"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Etupuoli"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Takapuoli"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Molemmat"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Viive"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Useita sivuja tasokuvanlukijasta"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "sekuntia"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Kuvanluku"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Tekstin tarkkuus"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Valokuvan tarkkuus"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Kirkkaus"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrasti"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Laatu"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Tummempi"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Vaaleampi"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Vähemmän"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Enemmän"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (korkea tarkkuus)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -992,12 +944,12 @@ msgid "Unable to connect to scanner"
 msgstr "Kuvanlukijaan ei voi yhdistää"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Kuvanluvun käynnistäminen ei onnistu"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Virhe viestinnässä kuvanlukijan kanssa"
 
@@ -1016,25 +968,55 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Korjaa vanhemmilla Kuvanlukijan versioilla luodut PDF-tiedostot"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Kuvanluku epäonnistui"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Kuvanluku meneillään"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[LAITE...] — Kuvanlukusovellus"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
-msgstr "Näet kaikki komentorivivalitsimet komennolla “%s --help”"
+msgstr "Näet kaikki komentorivivalitsimet komennolla “%s --help”."
+
+#~ msgid "Photo"
+#~ msgstr "Valokuva"
+
+#~ msgid "_Document"
+#~ msgstr "_Asiakirja"
+
+#~ msgid "Sc_an"
+#~ msgstr "Lue kuv_a"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "Py_säytä kuvanluku"
+
+#~ msgid "_Email"
+#~ msgstr "_Sähköposti"
+
+#~ msgid "_Page"
+#~ msgstr "_Sivu"
+
+#~ msgid "_Help"
+#~ msgstr "O_hje"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sisältö"
+
+#~ msgid "Save"
+#~ msgstr "Tallenna"
+
+#~ msgid "About"
+#~ msgstr "Tietoja"
 
 #~ msgid "Quit"
 #~ msgstr "Lopeta"
diff --git a/po/fr.po b/po/fr.po
index 6ba7269..a59024d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,23 +2,23 @@
 # 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.
-# Charles Monzat <superboa@hotmail.fr>, 2018.
+# Charles Monzat <charles.monzat@free.fr>, 2018-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-06-25 22:01+0000\n"
-"PO-Revision-Date: 2018-06-26 16:09+0200\n"
-"Last-Translator: Charles Monzat <superboa@hotmail.fr>\n"
-"Language-Team: français <gnomefr@traduc.org>\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-08 11:38+0100\n"
+"Last-Translator: Charles Monzat <charles.monzat@free.fr>\n"
+"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Gtranslator 2.91.7\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
 msgid "Device to scan from"
@@ -140,7 +140,7 @@ msgstr "Délai en millisecondes entre les pages."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Outil de numérisation Simple Scan"
 
@@ -180,207 +180,154 @@ msgstr "numériser;scanner;numériseur;à plat;adf;"
 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 "_Page unique"
-
-#. 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 "Toutes les pages du _bac d’alimentation"
-
-#. 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 "Pages _multiples depuis un numériseur à plat"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Texte"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Photo"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Document"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Nu_mériser"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Arrêter la numérisation"
-
-#. 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:1601
-msgid "Reorder Pages"
-msgstr "Réorganiser les pages"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_Courriel"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Page"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Faire pivoter vers la _gauche"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Faire pivoter vers la _droite"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "Re_cadrer"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "Aucu_n"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Personnalisé"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "Faire pivote_r la sélection"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Déplacer vers la gauche"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Déplacer vers la droite"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Aide"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Contenus"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Arrêter"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Numériser une seule page depuis le numériseur"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Arrêter la numérisation en cours"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Numériser"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Numériser une seule page depuis le numériseur"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Enregistrer"
+#: src/app-window.ui:405
+#| msgid "Single _Page"
+msgid "_Single Page"
+msgstr "_Page unique"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Arrêter la numérisation en cours"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Toutes les pages du _bac d’alimentation"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Arrêter"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "Pages _multiples depuis un numériseur à plat"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Recherche de périphériques de numérisation…."
+#: src/app-window.ui:498
+#| msgid "Text"
+msgid "_Text"
+msgstr "_Texte"
+
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Image"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Fermer"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Nom d’utilisateur et mot de passe nécessaires pour accéder à « %s »"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Recherche de périphériques de numérisation…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Prêt à numériser"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Logiciel supplémentaire nécessaire"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -389,153 +336,160 @@ msgstr ""
 "de votre périphérique de numérisation."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Aucun périphérique de numérisation n’a été détecté."
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Veuillez vérifier que votre périphérique de numérisation est connecté et "
 "sous tension."
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Enregistrer sous…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Annuler"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Enregistrer"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Annuler"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Document numérisé.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Fichiers image"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipage)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (sans perte)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (compressé)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Format du fichier :"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Compression :"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Un fichier nommé « %s » existe déjà. Souhaitez-vous le remplacer ?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Enregistrement"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Impossible d’enregistrer le fichier"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr ""
 "Si vous n’enregistrez pas, les modifications seront définitivement perdues."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Enregistrer le document actuel ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Contact du périphérique de numérisation…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Impossible d’enregistrer l’image pour la prévisualiser"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Impossible d’ouvrir l’aperçu de l’image"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+#| msgid "Reorder Pages"
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Réorganiser les pages"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Associer les côtés"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Associer les côtés (inverser)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Inverser"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Maintenir inchangé"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Impossible d’ouvrir le fichier d’aide"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -565,16 +519,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Contributions sur Launchpad :\n"
@@ -614,22 +568,22 @@ msgstr ""
 "  torglut https://launchpad.net/~torglut"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Enregistrer le document avant de quitter ?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Il semblerait que vous ayez un scanner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -638,12 +592,12 @@ msgstr ""
 "\">site Web de Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Il semblerait que vous ayez un scanner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -652,140 +606,137 @@ msgstr ""
 "\">site Web de Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Il semblerait que vous ayez un scanner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Il semblerait que vous ayez un scanner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
 msgstr ""
 "Les pilotes sont disponibles sur le <a href=\"http://support.epson.com"
-"\">site web d’Epson</a>."
+"\">site Web d’Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Installer les pilotes"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Une fois installés, vous devrez redémarrer Simple Scan."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Installation des pilotes…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Pilotes installés avec succès !"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Impossible d’installer les pilotes (code d’erreur %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Impossible d’installer les pilotes."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Vous devez installer le paquet %s."
 msgstr[1] "Vous devez installer les paquets %s."
 
+#: src/app-window.vala:1533
+msgid "Email"
+msgstr "Courriel"
+
+#: src/app-window.vala:1534
+#| msgid "Reorder Pages"
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Réorganiser les pages"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1579 src/app-window.vala:1602
-#: src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/app-window.vala:1583
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
-#: src/app-window.vala:1584
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Aide"
 
-#: src/app-window.vala:1585
-msgid "About"
-msgstr "À propos"
-
-#: src/app-window.vala:1586
-msgid "Quit"
-msgstr "Quitter"
-
-#: src/app-window.vala:1600
-msgid "Email"
-msgstr "Courriel"
-
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1610
+#: src/app-window.vala:1548
 msgid "Start Again…"
 msgstr "Recommencer…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1627
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Faire pivoter la page vers la droite (sens horaire)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1644
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Recadrer la page sélectionnée"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1660
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Supprimer la page sélectionnée"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1825
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Annuler"
 
 #. 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 "_Utilisateur :"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Mot de passe :"
 
 #: src/book.vala:331 src/book.vala:337
 #, c-format
 msgid "Unable to encode page %i"
-msgstr "Impossible d’encoder la page %i"
+msgstr "Impossible de coder la page %i"
 
 #: src/help-overlay.ui:12
 msgctxt "shortcut window"
@@ -805,7 +756,7 @@ msgstr "Numériser toutes les pages depuis le bac d’alimentation du numériseu
 #: src/help-overlay.ui:31
 msgctxt "shortcut window"
 msgid "Scan continuously from a flatbed scanner"
-msgstr "Numériser en continuer depuis le numériseur"
+msgstr "Numériser en continu depuis le numériseur"
 
 #: src/help-overlay.ui:38
 msgctxt "shortcut window"
@@ -873,149 +824,149 @@ msgid "Copy current page to clipboard"
 msgstr "Copier la page courante dans le presse-papiers"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Numériseur"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Faces à numériser"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Taille de la page"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Recto"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Verso"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Recto-verso"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Délai"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Pages multiples depuis un numériseur à plat"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Secondes"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Numérisation"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Résolution du _texte"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Résolution de la _photo"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Luminosité"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Contraste"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Qualité"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Moins"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Plus"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
-msgstr "%d ppp (par défaut)"
+msgstr "%d ppp (par défaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
-msgstr "%d ppp (brouillon)"
+msgstr "%d ppp (brouillon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr "%d ppp (haute résolution)"
+msgstr "%d ppp (haute résolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
-msgstr "%d ppp"
+msgstr "%d ppp"
 
 #. Error displayed when no scanners to scan with
 #: src/scanner.vala:844
@@ -1029,12 +980,12 @@ msgid "Unable to connect to scanner"
 msgstr "Impossible de se connecter au périphérique de numérisation"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Impossible de démarrer la numérisation"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Erreur de communication avec le périphérique de numérisation"
 
@@ -1054,24 +1005,57 @@ msgstr ""
 "Corriger les fichiers PDF générés avec les anciennes versions de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Échec de la numérisation"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Numérisation en cours"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
-msgstr "[DEVICE…] - Outil de numérisation"
+msgstr "[DEVICE…] — Outil de numérisation"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Exécutez « %s --help » pour voir la liste complète des options disponibles "
 "en ligne de commande."
+
+#~ msgid "Photo"
+#~ msgstr "Photo"
+
+#~ msgid "_Document"
+#~ msgstr "_Document"
+
+#~ msgid "Sc_an"
+#~ msgstr "Nu_mériser"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Arrêter la numérisation"
+
+#~ msgid "_Email"
+#~ msgstr "_Courriel"
+
+#~ msgid "_Page"
+#~ msgstr "_Page"
+
+#~ msgid "_Help"
+#~ msgstr "Aid_e"
+
+#~ msgid "_Contents"
+#~ msgstr "_Contenus"
+
+#~ msgid "Save"
+#~ msgstr "Enregistrer"
+
+#~ msgid "About"
+#~ msgstr "À propos"
+
+#~ msgid "Quit"
+#~ msgstr "Quitter"
diff --git a/po/fur.po b/po/fur.po
index c2eca59..6ab8fe6 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-06-25 22:01+0000\n"
-"PO-Revision-Date: 2018-06-26 22:17+0200\n"
+"POT-Creation-Date: 2019-02-22 07:57+0000\n"
+"PO-Revision-Date: 2019-02-28 19:53+0100\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <fur@li.org>\n"
 "Language: fur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -133,7 +133,7 @@ msgstr "Ritart in miliseconts tra lis pagjinis."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1266 src/app-window.vala:1520
 msgid "Simple Scan"
 msgstr "Scansion Semplice"
 
@@ -173,208 +173,153 @@ msgstr "scansion;scanner;scansionadôr;plan;adf;"
 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 "_Pagjine singule"
-
-#. 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 "_Dutis lis pagjinis dal cjariadôr"
-
-#. 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 "Pagjinis _multiplis dal plan di scansion"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Test"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Foto"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Document"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Sc_ansione"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Ferme la scansion"
-
-#. 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:1601
-msgid "Reorder Pages"
-msgstr "Torne ordene lis pagjinis"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-mail"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Pagjine"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Ribalte a _çampe"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Ribalte a _drete"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "Rifi_le"
 
 # rifiladure
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Nissune"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Personalizât"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Volte rifiladure"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Sposte a çampe"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Sposte a drete"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Jutori"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Contignûts"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Ferme"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Scansione une singule pagjine dal scansionadôr"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Ferme la scansion atuâl"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Scansione"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Scansione une singule pagjine dal scansionadôr"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Salve il document suntun file"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Salve"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "Pagjine _singule"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Ferme la scansion atuâl"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "_Dutis lis pagjinis dal cjariadôr"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Ferme"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "Pagjinis _multiplis dal plan di scansion"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Daûr a cirî scansionadôrs…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Test"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Imagjin"
+
+#: src/app-window.vala:221 src/app-window.vala:1353
 msgid "_Close"
 msgstr "_Siere"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:230
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Non utent e password necessaris par acedi a “%s”"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:246
+msgid "Searching for Scanners…"
+msgstr "Daûr a cirî scansionadôrs…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:252
 msgid "Ready to Scan"
 msgstr "Pront pe scansion"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:259
 msgid "Additional software needed"
 msgstr "Software adizionâl necessari"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:261
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -383,150 +328,156 @@ msgstr ""
 "pal scansionadôr."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:267
 msgid "No scanners detected"
 msgstr "Nissun scansionadôr rilevât"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:269
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controle che il scansionadôr al sedi tacât e impiât"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:292
 msgid "Save As…"
 msgstr "Salve come…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Anule"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:295 src/app-window.vala:549
 msgid "_Save"
 msgstr "_Salve"
 
+#: src/app-window.vala:296 src/app-window.vala:464 src/app-window.vala:548
+msgid "_Cancel"
+msgstr "_Anule"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:303
 msgid "Scanned Document.pdf"
 msgstr "Document scansionât.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:309
 msgid "Image Files"
 msgstr "File imagjin"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:319
 msgid "All Files"
 msgstr "Ducj i file"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:328
 msgid "PDF (multi-page document)"
 msgstr "PDF (document a plui pagjinis)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:334
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimût)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:340
 msgid "PNG (lossless)"
 msgstr "PNG (cence pierditis)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:347
 msgid "WebP (compressed)"
 msgstr "WebP (comprimût)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:357
 msgid "File format:"
 msgstr "formât file:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:369
 msgid "Compression:"
 msgstr "Compression:"
 
 #. 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:463
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Un file clamât “%s” al esist za.  Vuelistu sostituîlu?"
 
 #. 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:466
 msgid "_Replace"
 msgstr "_Sostituìs"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:505
 msgid "Saving"
 msgstr "Daûr a salvâ"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "No si è rivâts a salvâ il file"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:546
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Se no si salve, lis modifichis a laran pierdudis par simpri."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:582
 msgid "Save current document?"
 msgstr "Salvâ il document atuâl?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:584
 msgid "Discard Changes"
 msgstr "Scarte modifichis"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:717
 msgid "Contacting scanner…"
 msgstr "Daûr a contatâ il scansionadôr…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Impussibil salvâ la imagjin pe anteprime"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Impussibil vierzi la aplicazion pe anteprime de imagjin"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:974
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Torne ordene lis pagjinis"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:997
 msgid "Combine sides"
 msgstr "Cumbine bandis"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1007
 msgid "Combine sides (reverse)"
 msgstr "Cumbine bandis (inviers)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1017
 msgid "Reverse"
 msgstr "Inviers"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1027
 msgid "Keep unchanged"
 msgstr "Lasse no modificât"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1241
 msgid "Unable to open help file"
 msgstr "Impussibil vierzi il file di jutori"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1256
 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"
@@ -556,36 +507,36 @@ msgstr ""
 "cun chest program. In câs contrari, visite <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1259 src/app-window.vala:1541
 msgid "About Simple Scan"
 msgstr "Informazions su Scansion Semplice"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1262
 msgid "Simple document scanning tool"
 msgstr "Sempliç strument par scansionâ documents"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1271
 msgid "translator-credits"
 msgstr "Fabio Tomat <f.t.public@gmail.com>"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1287
 msgid "Save document before quitting?"
 msgstr "Salvâ il document prime di jessî?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1289
 msgid "Quit without Saving"
 msgstr "Jes cence salvâ"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1330
 msgid "You appear to have a Brother scanner."
 msgstr "Al semee che tu vedis un scansionadôr Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1332
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -594,12 +545,12 @@ msgstr ""
 "brother.com\">sît web de Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1336
 msgid "You appear to have a Samsung scanner."
 msgstr "Al semee che tu vedis un scansionadôr Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1338
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -608,17 +559,17 @@ msgstr ""
 "com/support\">sît web de Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1342
 msgid "You appear to have an HP scanner."
 msgstr "Al semee che tu vedis un scansionadôr HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1347
 msgid "You appear to have an Epson scanner."
 msgstr "Al semee che tu vedis un scansionadôr Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1349
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -627,114 +578,110 @@ msgstr ""
 "epson.com\">sît web de Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1353
 msgid "Install drivers"
 msgstr "Instale driver"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1386
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Une volte instalât si scugne tornâ a inviâ Scansion Semplice."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1399
 msgid "Installing drivers…"
 msgstr "Daûr a instalâ i driver…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1407
 msgid "Drivers installed successfully!"
 msgstr "Driver instalâts cun sucès!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1417
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "No si è rivâts a instalâ i driver (codiç di erôr %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1423
 msgid "Failed to install drivers."
 msgstr "No si è rivâts a instalâ i driver."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1430
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Si scugne instalâ il pachet %s."
 msgstr[1] "Si scugne instalâ i pachets %s."
 
+#: src/app-window.vala:1534
+msgid "Email"
+msgstr "E-mail"
+
+#: src/app-window.vala:1535
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Torne ordene pagjinis"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1579 src/app-window.vala:1602
-#: src/preferences-dialog.ui:53
+#: src/app-window.vala:1538 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Preferencis"
 
-#: src/app-window.vala:1583
+#: src/app-window.vala:1539
 msgid "Keyboard Shortcuts"
 msgstr "Scurtis di tastiere"
 
-#: src/app-window.vala:1584
+#: src/app-window.vala:1540
 msgid "Help"
 msgstr "Jutori"
 
-#: src/app-window.vala:1585
-msgid "About"
-msgstr "Informazions"
-
-#: src/app-window.vala:1586
-msgid "Quit"
-msgstr "Jes"
-
-#: src/app-window.vala:1600
-msgid "Email"
-msgstr "E-mail"
-
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1610
+#: src/app-window.vala:1549
 msgid "Start Again…"
 msgstr "Torne tache…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1627
+#: src/app-window.vala:1568
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Zire la pagjine a çampe (sens antiorari)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1577
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Zire la pagjine a drete (sens orari)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1644
+#: src/app-window.vala:1589
 msgid "Crop the selected page"
 msgstr "Rifile la pagjine selezionade"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1660
+#: src/app-window.vala:1607
 msgid "Delete the selected page"
 msgstr "Elimine la pagjine selezionade"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1825
+#: src/app-window.vala:1751
 msgid "Cancel"
 msgstr "Anule"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Autorize"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Non utent pe risorse:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Password:"
 
@@ -829,147 +776,147 @@ msgid "Copy current page to clipboard"
 msgstr "Copie la pagjine atuâl tes notis"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Scansionadôr"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Bandis de scansion"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Dimension pagjine"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Denant"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Daûr"
 
 # lis bandis de pagjine
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Dutis dôs"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Ritart"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Pagjinis multiplis dal plan di scansion"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Seconts"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Scansion"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Risoluzion _test"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Risoluzion _foto"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Luminositât"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Contrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Cualitât"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Plui scûr"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Plui clâr"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Mancul"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Plui"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppo (predefinît)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppo (stampon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppo (alte risoluzion)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppo"
@@ -985,12 +932,12 @@ msgid "Unable to connect to scanner"
 msgstr "Impussibil tacâsi a un scansionadôr"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Impussibil tacâ la scansion"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Erôr tal comunicâ cul scansionadôr"
 
@@ -1010,28 +957,61 @@ msgstr ""
 "Comede i file PDF gjenerâts cun versions di Scansion Semplice plui vecjis"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "No si è rivâts a scansionâ"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Scansion in cors"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[DISPOSITÎF…] — utilitât di scansionament"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Eseguìs “%s --help” par viodi la liste di dutis lis opzions disponibilis te "
 "rie di comant."
 
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Document"
+
+#~ msgid "Sc_an"
+#~ msgstr "Sc_ansione"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Ferme la scansion"
+
+#~ msgid "_Email"
+#~ msgstr "_E-mail"
+
+#~ msgid "_Page"
+#~ msgstr "_Pagjine"
+
+#~ msgid "_Help"
+#~ msgstr "_Jutori"
+
+#~ msgid "_Contents"
+#~ msgstr "_Contignûts"
+
+#~ msgid "Save"
+#~ msgstr "Salve"
+
+#~ msgid "About"
+#~ msgstr "Informazions"
+
+#~ msgid "Quit"
+#~ msgstr "Jes"
+
 #~ msgid "Saving document…"
 #~ msgstr "Daûr a salvâ il document…"
 
diff --git a/po/gl.po b/po/gl.po
index 174330b..072ae0f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,15 +2,15 @@
 # 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.
-# Fran Dieguez <frandieguez@gnome.org>, 2017, 2018.
+# Fran Dieguez <frandieguez@gnome.org>, 2017-2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-08-26 21:44+0000\n"
-"PO-Revision-Date: 2018-08-30 10:14+0200\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-09 16:26+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
-"Language-Team: Proxecto Trasno <proxecto@trasno.gal>\n"
+"Language-Team: Galician\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,7 +136,7 @@ msgstr "Atraso en milisegundos entre páxinas."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Escáner sinxelo"
 
@@ -175,207 +175,152 @@ msgstr "escanear;escáner;flatbed;adf;"
 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 "Única _páxina"
-
-#. 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 "Todas as páxinas do _alimentador"
-
-#. 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 "_Múltiples páxinas desde Flatbed"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Texto"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Fotografía"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Documento"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Esc_anear"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Deter o escaneado"
-
-#. 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 "Reordenar as páxinas"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "Correo-_e"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Páxina"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Rotar á _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Rotar á _dereita"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Ningún"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Rotar o recorte"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Mover á esquerda"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Mover á dereita"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Axuda"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Contidos"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Deter"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Escanear unha única páxina co escáner"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Deter o escaneo actual"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Escanear"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Escanear unha única páxina co escáner"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Gardar o documento nun ficheiro"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Gardar"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "Única _páxina"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Deter o escaneo actual"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Todas as páxinas do _alimentador"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Deter"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Múltiples páxinas desde Flatbed"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Buscando escáneres…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Texto"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Imaxe"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Pechar"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Requírese o nome de usuario e o contrasinal para acceder a «%s»"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Buscando escáneres…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Listo para escanear"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Precísase software adicional"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -384,150 +329,157 @@ msgstr ""
 "escáner."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Non se detectou ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique que o seu escáner está conectado e aceso"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Gardar como…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Gardar"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Cancelar"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Ficheiros de imaxes"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento de varias páxinas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (sen perdas)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (comprimido)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Formato do ficheiro:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Compresión:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Xa existe un ficheiro co nome «%s». Desexa substituílo?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Substituír"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Gardando"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Produciuse un fallo ao gardar o ficheiro"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Gardar o documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Rexeitar os cambios"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Contactando co escáner…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Non foi posíbel gardar a imaxe da miniatura"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+#| msgid "Reorder Pages"
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Reordenar as páxinas"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Manter sen cambios"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Non é posíbel abrir o ficheiro de axuda"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -556,16 +508,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Ferramenta sinxela de escaneado de documentos"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -576,22 +528,22 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Gardar o documento antes de saír?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Semella que ten un escáner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -600,12 +552,12 @@ msgstr ""
 "href=\"http://support.brother.com\">Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Semella ter un escáner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -614,17 +566,17 @@ msgstr ""
 "href=\"http://samsung.com/support\">Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Semella ter un escáner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Semella ter un escáner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -633,110 +585,112 @@ msgstr ""
 "epson.com\">Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Instalar controladores"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Unha vez instalados deberá reiniciar o Escáner Sinxelo."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Instalando os controladores…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Os controladores instaláronse correctamente."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 "Produciuse un fallo na instalación dos controladores (código do erro %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Produciuse un fallo na instalación dos controladores."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Necesita instalar o paquete %s."
 msgstr[1] "Necesita instalar o paquete %s."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "Correo electrónico"
 
+#: src/app-window.vala:1534
+#| msgid "Reorder Pages"
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Reordenar as páxinas"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Atallos de teclado"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Axuda"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Sobre"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Comezar de novo…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Xirar a páxina á dereita (sentido do reloxo)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Recortar a páxina seleccionada"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Eliminar a páxina seleccionada"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Nome de _usuario para o recurso:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
@@ -831,146 +785,146 @@ msgid "Copy current page to clipboard"
 msgstr "Copiar a páxina actual ao portapapeis"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Escáner"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Escanear lados"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Tamaño da pantalla"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Anverso"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Reverso"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Ambos"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Atraso"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Varias páxinas do escáner"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Segundos"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Escaneando"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Resolución de _texto"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Resolución _fotográfica"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Brillo"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Contraste"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Calidade"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Máis escuro"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Máis claro"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Menos"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Máis"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
@@ -986,12 +940,12 @@ msgid "Unable to connect to scanner"
 msgstr "Non foi posíbel conectar co escáner"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Non foi posíbel iniciar o escaneado"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Produciuse un erro na comunicación co escáner"
 
@@ -1032,6 +986,36 @@ msgstr ""
 "Ejecute «%s --help» para ver unha lista completa das opcións de liña de "
 "ordes dispoñíbeis."
 
+#~ msgid "Photo"
+#~ msgstr "Fotografía"
+
+#~ msgid "_Document"
+#~ msgstr "_Documento"
+
+#~ msgid "Sc_an"
+#~ msgstr "Esc_anear"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Deter o escaneado"
+
+#~ msgid "_Email"
+#~ msgstr "Correo-_e"
+
+#~ msgid "_Page"
+#~ msgstr "_Páxina"
+
+#~ msgid "_Help"
+#~ msgstr "_Axuda"
+
+#~ msgid "_Contents"
+#~ msgstr "_Contidos"
+
+#~ msgid "Save"
+#~ msgstr "Gardar"
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
 #~ msgid "Quit"
 #~ msgstr "Saír"
 
diff --git a/po/hr.po b/po/hr.po
index ec1930f..d570b47 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\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-09-02 20:40+0200\n"
+"POT-Creation-Date: 2019-03-24 19:13+0000\n"
+"PO-Revision-Date: 2019-03-25 21:09+0100\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "Language: hr\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-07-25 17:32+0000\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.0.6\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -135,7 +135,7 @@ msgstr "Odgoda u milisekundama između stranica."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1266 src/app-window.vala:1520
 msgid "Simple Scan"
 msgstr "Skeniranje dokumenata"
 
@@ -170,211 +170,152 @@ msgstr "Skener dokumenta"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skeniraj;skener;plosnat;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 "Jednu _stranicu"
-
-#. 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 "Sve stranice iz _uvlakača"
-
-#. 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 "_Višestruke stranice iz plošnog skenera"
-
-#: 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 "Fotografija"
-
-#. 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_eniraj"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Zaustavi skeniranje"
-
-#. 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 "Presloži stranice"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-pošta"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Stranica"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Zakreni _lijevo"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Zakreni _desno"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Izreži"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Ništa"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Pr_avno"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Prilagođeno"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Zakreni isječak"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Pomakni ulijevo"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Pomakni udesno"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Priručnik"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Priručnik"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Zaustavi"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Skeniraj jednu stranicu sa skenera"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Zaustavi trenutno skeniranje"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Skeniraj"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Skeniraj jednu stranicu sa skenera"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Spremi dokument u datoteku"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Spremi"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Jednu stranicu"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Zaustavi trenutno skeniranje"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Sve stranice iz _uvlakača"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Zaustavi"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Višestruke stranice iz plošnog skenera"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Pretraživanje skenera. . ."
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Tekst"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Slika"
+
+#: src/app-window.vala:221 src/app-window.vala:1353
 msgid "_Close"
 msgstr "_Zatvori"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:230
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Korisničko ime i lozinka su potrebni za pristup “%s”"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:246
+msgid "Searching for Scanners…"
+msgstr "Pretraživanje skenera…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:252
 msgid "Ready to Scan"
 msgstr "Spreman za skeniranje"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:259
 msgid "Additional software needed"
 msgstr "Potreban je dodatan softver"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:261
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -383,150 +324,156 @@ msgstr ""
 "vaš skener."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:267
 msgid "No scanners detected"
 msgstr "Nema otkrivenih skenera"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:269
 msgid "Please check your scanner is connected and powered on"
 msgstr "Provjerite je li vaš skener spojen i uključen"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:292
 msgid "Save As…"
 msgstr "Spremi kao…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Odustani"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:295 src/app-window.vala:549
 msgid "_Save"
 msgstr "_Spremi"
 
+#: src/app-window.vala:296 src/app-window.vala:464 src/app-window.vala:548
+msgid "_Cancel"
+msgstr "_Odustani"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:303
 msgid "Scanned Document.pdf"
 msgstr "Skenirani dokument.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:309
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:319
 msgid "All Files"
 msgstr "Sve datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:328
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument od više stranica)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:334
 msgid "JPEG (compressed)"
 msgstr "JPEG (sažeto)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:340
 msgid "PNG (lossless)"
 msgstr "PNG (bez gubitaka)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:347
 msgid "WebP (compressed)"
 msgstr "WebP (sažeto)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:357
 msgid "File format:"
 msgstr "Format datoteke:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:369
 msgid "Compression:"
 msgstr "Sažimanje:"
 
 #. 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:463
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Datoteka naziva “%s” već postoji.  Želite li ju zamijeniti?"
 
 #. 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:466
 msgid "_Replace"
 msgstr "_Zamijeni"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:505
 msgid "Saving"
 msgstr "Spremanje"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Neuspjelo spremanje datoteke"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:546
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Ako ne spremite, promjene će biti trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:582
 msgid "Save current document?"
 msgstr "Spremi trenutni dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:584
 msgid "Discard Changes"
 msgstr "Odbaci promjene"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:717
 msgid "Contacting scanner…"
-msgstr "Kontaktiranje skenera. . ."
+msgstr "Kontaktiranje skenera…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Neuspjelo spremanje slike za pregled"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Nemoguće otvaranje aplikacije pregleda slike"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:974
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Preslaganje stranica"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:997
 msgid "Combine sides"
 msgstr "Kombiniraj strane"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1007
 msgid "Combine sides (reverse)"
 msgstr "Kombiniraj strane (obrnuto)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1017
 msgid "Reverse"
 msgstr "Obrnuto"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1027
 msgid "Keep unchanged"
 msgstr "Zadrži nepromijenjeno"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1241
 msgid "Unable to open help file"
 msgstr "Nemoguće otvaranje datoteke pomoći"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1256
 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"
@@ -555,44 +502,38 @@ msgstr ""
 "program. Ako niste, posjetite <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1259 src/app-window.vala:1541
 msgid "About Simple Scan"
 msgstr "O skeniranju dokumenata"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1262
 msgid "Simple document scanning tool"
 msgstr "Alat za jednostavno skeniranje"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1271
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Ante Karamatić https://launchpad.net/~ivoks\n"
-"  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
-"  Renato Kalanj https://launchpad.net/~renato-kalanj\n"
-"  Saša Teković https://launchpad.net/~hseagle2015\n"
-"  Tina Kružić https://launchpad.net/~tina-kruzic\n"
-"  gogo https://launchpad.net/~trebelnik-stefina\n"
-"  student4 https://launchpad.net/~iputnik-msn"
+"  gogo https://launchpad.net/~trebelnik-stefina"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1287
 msgid "Save document before quitting?"
 msgstr "Spremi dokument prije zatvaranja?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1289
 msgid "Quit without Saving"
 msgstr "Zatvori bez spremanja"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1330
 msgid "You appear to have a Brother scanner."
 msgstr "Izgleda kako imate Brother skener."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1332
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -601,12 +542,12 @@ msgstr ""
 "\">Brother web stranici</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1336
 msgid "You appear to have a Samsung scanner."
 msgstr "Izgleda kako imate Samsung skener."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1338
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -615,17 +556,17 @@ msgstr ""
 "\">Samsung web stranici</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1342
 msgid "You appear to have an HP scanner."
 msgstr "Izgleda kako imate HP skener."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1347
 msgid "You appear to have an Epson scanner."
 msgstr "Izgleda kako imate Epson skener."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1349
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -634,39 +575,39 @@ msgstr ""
 "epson.com\">Epson web stranici</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1353
 msgid "Install drivers"
 msgstr "Instaliraj upravljački program"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1386
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Jednom kada se instalira, morate ponovno pokrenuti Skeniranje dokumenata."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1399
 msgid "Installing drivers…"
-msgstr "Instalacija upravljačkih programa..."
+msgstr "Instalacija upravljačkih programa…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1407
 msgid "Drivers installed successfully!"
 msgstr "Upravljački programi su uspješno instalirani!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1417
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Neuspjela instalacija upravljačkih programa (kôd greške %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1423
 msgid "Failed to install drivers."
 msgstr "Neuspjela instalacija upravljačkih programa."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1430
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -674,71 +615,72 @@ msgstr[0] "Morate instalirati %s paket."
 msgstr[1] "Morate instalirati %s paketa."
 msgstr[2] "Morate instalirati %s paketa."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1534
 msgid "Email"
 msgstr "E-pošta"
 
+#: src/app-window.vala:1535
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Preslaganje stranica"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1538 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Osobitosti"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1539
 msgid "Keyboard Shortcuts"
 msgstr "Prečaci tipkovnice"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1540
 msgid "Help"
 msgstr "Priručnik"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "O programu"
-
 #. 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:1549
 msgid "Start Again…"
-msgstr "Ponovno pokreni..."
+msgstr "Ponovno pokreni…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1568
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Zakreni stranicu ulijevo (obrnuto od kazaljke na satu)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1577
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Zakreni stranicu udesno (u smjeru kazaljke na satu)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1589
 msgid "Crop the selected page"
 msgstr "Izreži odabranu stranicu"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1607
 msgid "Delete the selected page"
 msgstr "Obriši odabranu stranicu"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1751
 msgid "Cancel"
 msgstr "Odustani"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Ovlasti"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Korisničko ime za izvor:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Lozinka:"
 
@@ -833,146 +775,146 @@ msgid "Copy current page to clipboard"
 msgstr "Kopiraj trenutnu stranicu u međuspremnik"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Skener"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Stranica skeniranja"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Veličina stranice"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Prednja"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Stražnja"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Obje"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Odgoda"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Višestruke stranice iz plošnog skenera"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Sekune"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Skeniranje"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Razlučivost teksta"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Razlučivost slike"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Svjetlina"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kvaliteta"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatska"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Tamnije"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Svjetlije"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Manje"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Više"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (zadano)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (skica)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (visoka razlučivost)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -988,12 +930,12 @@ msgid "Unable to connect to scanner"
 msgstr "Nemoguće povezivanje sa skenerom"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Nemoguće pokretanje skenera"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Greška pri komunikaciji sa skenerom"
 
@@ -1035,6 +977,39 @@ msgstr ""
 "Pokreni “%s --help” kako biste vidjeli potpuni popis mogućnosti naredbenog "
 "redka."
 
+#~ msgid "scanner"
+#~ msgstr "scanner"
+
+#~ msgid "Photo"
+#~ msgstr "Fotografija"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokument"
+
+#~ msgid "Sc_an"
+#~ msgstr "Sk_eniraj"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Zaustavi skeniranje"
+
+#~ msgid "_Email"
+#~ msgstr "_E-pošta"
+
+#~ msgid "_Page"
+#~ msgstr "_Stranica"
+
+#~ msgid "_Help"
+#~ msgstr "_Priručnik"
+
+#~ msgid "_Contents"
+#~ msgstr "_Priručnik"
+
+#~ msgid "About"
+#~ msgstr "O programu"
+
+#~ msgid "Save"
+#~ msgstr "Spremi"
+
 #~ msgid "Quit"
 #~ msgstr "Zatvori"
 
diff --git a/po/hu.po b/po/hu.po
index 13c28fa..8e67364 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,23 +1,23 @@
-# Hungarian translation for simple-scan
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Hungarian translation for simple-scan.
+# Copyright (c) 2017, 2019 The Free Software Foundation, inc.
 # This file is distributed under the same license as the simple-scan package.
 #
 # Gabor Kelemen <kelemeng at ubuntu dot com>, 2017.
-# Balázs Úr <urbalazs at gmail dot com>, 2017.
+# Balázs Úr <urbalazs at gmail dot com>, 2017, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: simple-scan\n"
+"Project-Id-Version: simple-scan master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-09-03 03:00+0000\n"
-"PO-Revision-Date: 2018-09-03 12:01+0200\n"
-"Last-Translator: Meskó Balázs <mesko.balazs@fsf.hu>\n"
-"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
+"POT-Creation-Date: 2019-02-07 01:56+0000\n"
+"PO-Revision-Date: 2019-02-07 08:12+0100\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -134,7 +134,7 @@ msgstr "A lapok közti késleltetés ezredmásodpercben."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Szkenner"
 
@@ -173,206 +173,152 @@ msgstr "szkennelés;szkenner;beolvasó;síkágyas;adf;"
 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 "Egy _oldal"
-
-#. 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 "Minden oldal az _adagolóból"
-
-#. 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 "_Több lap a síkágyról"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Szöveg"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Fénykép"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Dokumentum"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Sz_kennelés"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Szkennelés megállítása"
-
-#. 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 "Oldalak újrarendezése"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-mail"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Oldal"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Forgatás b_alra"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Forgatás _jobbra"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Vágás"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Nincs vágás"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Egyéni"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "Vágott rész fo_rgatása"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Mozgatás balra"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Mozgatás jobbra"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Súgó"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Tartalom"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Leállít"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Egy oldal szkennelése az eszközről"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "A jelenlegi szkennelés leállítása"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Szkennelés"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Egy oldal szkennelése az eszközről"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Dokumentum fájlba mentése"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Mentés"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "Egy _oldal"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "A jelenlegi szkennelés leállítása"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Minden oldal az _adagolóból"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Leállít"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Több lap a síkágyról"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Szkennerek keresése…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Szöveg"
+
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Kép"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Bezárás"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "A(z) „%s” eléréséhez felhasználónév és jelszó szükséges"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Szkennerek keresése…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Szkennelésre kész"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "További szoftverek szükségesek"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -381,150 +327,156 @@ msgstr ""
 "telepíteni</a>."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Nem található szkenner"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Mentés másként…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Mégse"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Mentés"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Mégse"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Szkennelt dokumentum.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Képfájlok"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Minden fájl"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (többoldalas dokumentum)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (tömörített)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (veszteségmentes)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (tömörített)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Fájlformátum:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Tömörítés:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Már létezik „%s” nevű fájl. Le akarja cserélni?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Csere"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Mentés"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "A fájl mentése sikertelen"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Mentse az aktuális dokumentumot?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Módosítások eldobása"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Kapcsolatfelvétel a szkennerrel…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "A képfájlt nem lehet elmenteni előnézethez"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Oldalak újrarendezése"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Oldalak egyesítése"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Oldalak egyesítése (fordított)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Fordított"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Maradjon változatlan"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "A súgófájl nem nyitható meg"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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 +504,16 @@ msgstr ""
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Szkenner névjegye"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Meskó Balázs <meskobalazs at fedoraproject dot org>\n"
@@ -580,22 +532,22 @@ msgstr ""
 "  Úr Balázs https://launchpad.net/~urbalazs"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Menti a dokumentumot kilépés előtt?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Kilépés mentés nélkül"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Úgy tűnik, Brother márkájú szkennere van."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -604,12 +556,12 @@ msgstr ""
 "érhetők el illesztőprogramok."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Úgy tűnik, Samsung márkájú szkennere van."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -618,17 +570,17 @@ msgstr ""
 "érhetők el illesztőprogramok."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Úgy tűnik, HP márkájú szkennere van."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Úgy tűnik, Epson márkájú szkennere van."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -637,109 +589,110 @@ msgstr ""
 "el illesztőprogramok."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Illesztőprogramok telepítése"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "A telepítés után újra kell indítania a Szkennert."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Illesztőprogramok telepítése…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Az illesztőprogramok sikeresen telepítve!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Az illesztőprogramok telepítése meghiúsult (hibakód: %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Az illesztőprogramok telepítése meghiúsult."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Telepíteni kell a következő csomagot: %s."
 msgstr[1] "Telepíteni kell a következő csomagokat: %s."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "Küldés e-mailben"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Oldalak újrarendezése"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Gyorsbillentyűk"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Súgó"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Névjegy"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Újrakezdés…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Az oldal elforgatása balra (az óra járásával ellentétesen)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Az oldal elforgatása jobbra (az óra járásával egyezően)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "A kiválasztott oldal vágása"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "A kiválasztott oldal törlése"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Mégse"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Felhatalmazás"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Felhasználónév az erőforráshoz:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Jelszó:"
 
@@ -834,146 +787,146 @@ msgid "Copy current page to clipboard"
 msgstr "Jelenlegi lap másolása a vágólapra"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "Szk_enner"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Szélek szkennelése"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Oldalméret"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Előlap"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Hátlap"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Mindkettő"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Késleltetés"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Több lap a síkágyról"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "másodperc"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Szkennelés"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Szöveg _felbontása"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Fotó felbontása"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Fényerő"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontraszt"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Minőség"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Sötétebb"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Világosabb"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Kevesebb"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Több"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (alapértelmezett)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vázlat)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (nagy felbontás)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -989,12 +942,12 @@ msgid "Unable to connect to scanner"
 msgstr "Nem sikerült csatlakozni a szkennerhez"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Nem sikerült elindítani a szkennelést"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Kommunikációs hiba a szkennerrel"
 
@@ -1033,6 +986,3 @@ msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Futtassa a(z) „%s --help” parancsot a parancssori kapcsolók listájáért."
-
-#~ msgid "Quit"
-#~ msgstr "Kilépés"
diff --git a/po/id.po b/po/id.po
index 294d1cd..d430f04 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-06-25 22:01+0000\n"
-"PO-Revision-Date: 2018-06-26 16:42+0700\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-08 22:47+0700\n"
 "Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "Language: id\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.0.6\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.2.1\n"
+"Plural-Forms: nplurals=2; plural= n!=1;\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
 msgid "Device to scan from"
@@ -134,7 +134,7 @@ msgstr "Tundaan dalam mili detik antar halaman."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Pemindai Ringkas"
 
@@ -173,206 +173,152 @@ msgstr "scan;scanner;pelarik;pemindai;flatbed;adf;"
 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 "Satu _Halaman"
-
-#. 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 "Semua Halaman Dari _Feeder"
-
-#. 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 "Beberapa Hala_man Dari Flatbed"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Teks"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Foto"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Dokumen"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Pind_ai"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "Berhenti _Memindai"
-
-#. 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:1601
-msgid "Reorder Pages"
-msgstr "Atur Ulang Halaman"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "Sur_el"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Halaman"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Putar _Kiri"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Putar Ka_nan"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Potong"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Nihil"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4x6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Ubahan"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "Puta_r dan Potong"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Pindah Ke Kiri"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Pindah Ke Kanan"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "Ba_ntuan"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Isi"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Stop"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Pindai sebuah halaman dari pemindai"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Hentikan pemindaian"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Pindai"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Pindai sebuah halaman dari pemindai"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Simpan hasil dalam berkas"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Simpan"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Satu Halaman"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Hentikan pemindaian"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Semua Halaman Dari _Feeder"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Stop"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "Beberapa Hala_man Dari Flatbed"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Mencari Pemindai…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Teks"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Gambar"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Tutup"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Nama pengguna dan kata sandi dibutuhkan untuk mengakses \"%s\""
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Mencari Pemindai…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Siap Memindai"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Perlu perangkat lunak tambahan"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -381,150 +327,156 @@ msgstr ""
 "a> bagi pemindai Anda."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Tidak ada pemindai yang terdeteksi"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
-msgstr "Simpan Sebagai..."
-
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Batal"
+msgstr "Simpan Sebagai…"
 
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Simpan"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Batal"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Hasil Pindai.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Berkas Citra"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Semua Berkas"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen multi-halaman)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (terkompresi)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (terkompresi)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Format berkas:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Kompresi:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Berkas dengan nama \"%s\" sudah ada. Apakah Anda ingin menimpanya?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Timpa"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Menyimpan"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Gagal menyimpan berkas"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Jika Anda tidak menyimpan, perubahan akan hilang secara permanen."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Simpan dokumen saat ini?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Buang Perubahan"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Menghubungi pemindai…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Tak dapat menyimpan gambar untuk pratinjau"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Tidak dapat membuka aplikasi pratinjau gambar"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Atur Ulang Halaman"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Kombinasikan sisi-sisi"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Kombinasikan sisi-sisi (balik)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Balikkan"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Biarkan tak berubah"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Tak dapat membuka berkas bantuan"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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,19 +504,19 @@ msgstr ""
 "bersama program ini. Bila tidak, lihat <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Tentang Simple Scan"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Alat pemindai dokumen sederhana"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
-"Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017, 2018.\n"
+"Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017, 2018, 2019.\n"
 "\n"
 "Launchpad Contributions:\n"
 "  Abdul Munif Hanafi https://launchpad.net/~nafica-coroz\n"
@@ -582,22 +534,22 @@ msgstr ""
 "  jemmy surya https://launchpad.net/~jemmy"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
-msgstr "Simpan dokumen sebelum keluar"
+msgstr "Simpan dokumen sebelum keluar?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Keluar tanpa menyimpan"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Nampaknya Anda punya pemindai Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -606,12 +558,12 @@ msgstr ""
 "web Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Nampaknya Anda punya pemindai Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -620,17 +572,17 @@ msgstr ""
 "web Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Nampaknya Anda punya pemindai HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Nampaknya Anda punya pemindai Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -639,113 +591,110 @@ msgstr ""
 "web Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Pasang penggerak"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Sekali terpasang Anda perlu memulai ulang Simple Scan."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Memasang penggerak…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Penggerak sukses terpasang!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Gagal memasang penggerak (kode kesalahan %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Gagal memasang penggerak."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Anda perlu memasang paket %s."
+msgstr[1] "Anda perlu memasang paket %s."
+
+#: src/app-window.vala:1533
+msgid "Email"
+msgstr "Surel"
+
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Atur Ulang Halaman"
 
 #. Title of preferences dialog
-#: src/app-window.vala:1579 src/app-window.vala:1602
-#: src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Preferensi"
 
-#: src/app-window.vala:1583
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Pintasan Papan Tik"
 
-#: src/app-window.vala:1584
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Bantuan"
 
-#: src/app-window.vala:1585
-msgid "About"
-msgstr "Perihal"
-
-#: src/app-window.vala:1586
-msgid "Quit"
-msgstr "Keluar"
-
-#: src/app-window.vala:1600
-msgid "Email"
-msgstr "Surel"
-
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1610
+#: src/app-window.vala:1548
 msgid "Start Again…"
 msgstr "Mulai lagi…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1627
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Putar halaman ke kiri (berlawanan arah jarum jam)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Putar halaman ke kanan (searah jarum jam)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1644
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Potong halaman yang dipilih"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1660
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Hapus halaman yang dipilih"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1825
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Batal"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "Otoris_asikan"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Nama pengg_una untuk sumber daya:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Sandi:"
 
@@ -840,146 +789,146 @@ msgid "Copy current page to clipboard"
 msgstr "Salin halaman ini ke papan klip"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Pemindai"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
-msgstr "Bidang Pindai:"
+msgstr "Bidang Pindai"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Ukuran Halaman"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Depan"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Belakang"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Keduanya"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Tunda"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Beberapa halaman dari flatbed"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Detik"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Memindai"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Resolusi _Teks"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Resolusi _Foto"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Kecerahan"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontras"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kualitas"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Otomatis"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Lebih Terang"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Kurang"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Lebih"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (resolusi tinggi)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -995,12 +944,12 @@ msgid "Unable to connect to scanner"
 msgstr "Tak dapat terhubung ke pemindai"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Tak dapat memulai pemindaian"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Galat saat berhubungan dengan pemindai"
 
@@ -1019,23 +968,56 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Perbaiki berkas PDF yang dibuat dengan Simple Scan versi lawas"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Gagal memindai"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Pemindaian sedang berlangsung"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[PERANGKAT...] — Utilitas pemindaian"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Jalankan \"%s --help\" untuk melihat daftar lengkap opsi yang tersedia."
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokumen"
+
+#~ msgid "Sc_an"
+#~ msgstr "Pind_ai"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "Berhenti _Memindai"
+
+#~ msgid "_Email"
+#~ msgstr "Sur_el"
+
+#~ msgid "_Page"
+#~ msgstr "_Halaman"
+
+#~ msgid "_Help"
+#~ msgstr "Ba_ntuan"
+
+#~ msgid "_Contents"
+#~ msgstr "_Isi"
+
+#~ msgid "Save"
+#~ msgstr "Simpan"
+
+#~ msgid "About"
+#~ msgstr "Perihal"
+
+#~ msgid "Quit"
+#~ msgstr "Keluar"
diff --git a/po/is.po b/po/is.po
new file mode 100644
index 0000000..4090ad2
--- /dev/null
+++ b/po/is.po
@@ -0,0 +1,1029 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Sveinn í Felli <sv1@fellsnet.is>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
+"POT-Creation-Date: 2019-02-07 14:04+0000\n"
+"PO-Revision-Date: 2019-02-22 07:55+0000\n"
+"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
+"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
+"Language: is\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Tæki til að skanna með"
+
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-tæki til að ná í mynd frá."
+
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tegund skjals sem verið er að skanna"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tegund skjals sem verið er að skanna. Þessi stilling ákvarðar upplausn"
+" skönnunar, liti og eftirvinnsluferli"
+
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Breidd pappírs í tíundu hlutum úr millímetra"
+
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Breidd pappírsins í tíundu hlutum úr millímetra (eða 0 til að greina"
+" pappírsstærð sjálfvirkt)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Hæð pappírs í tíundu hlutum úr millímetra"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Hæð pappírsins í tíundu hlutum úr millímetra (eða 0 til að greina"
+" pappírsstærð sjálfvirkt)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Birtustig skönnunar"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Aðlögun birtustigs, frá -100 til 100 (0 er ekkert)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Birtuskil skönnunar"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Aðlögun birtuskila, frá -100 til 100 (0 er ekkert)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Upplausn fyrir skönnun texta"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Upplausn í mynddílum-á-tommu sem á að nota við að skanna texta."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Upplausn fyrir skönnun ljósmynda"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Upplausn í mynddílum-á-tommu sem á að nota við að skanna ljósmyndir."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Hlið síðu sem á að skanna"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Hlið síðunnar sem á að skanna."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Mappan sem vista á skrár í"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Mappan sem vista á skrár í. Ef ekki er stillt, verður sjálfgefin skjalamappa."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Gæðastilling sem á að nota við JPEG-þjöppun"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Gæðastilling sem á að nota við JPEG-þjöppun."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Töf milli síðna í millísekúndum"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Töf milli síðna í millísekúndum."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. 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 "Einfalt skönnunarforrit"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skanna skjöl"
+
+#: 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 ""
+"Mjög einföld leið til að skanna bæði skjöl og ljósmyndir. Þú getur skorið af"
+" óþarfa hluta mynda og snúið þeim ef þörf er á. Þú getur prentað það sem þú"
+" skannar, flutt það út í PDF-skrár, eða vistað það sem ýmsar gerðir myndskráa."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Einfalda skönnunarforritið Simple Scan notar SANE-kerfið til stuðnings"
+" flestum þeim skönnum sem eru í umferð."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skjalaskanni"
+
+#. 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
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skanna;skanni;flatskanni;adf;matari;"
+
+#. 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 "_Ein síða"
+
+#. 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 "_Allar síður úr síðumatara"
+
+#. 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 "_Margar síður úr flatskanna"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
+msgid "Text"
+msgstr "Texti"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
+msgid "Photo"
+msgstr "Ljósmynd"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "S_kjal"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_anna"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stöðva skönnun"
+
+#. 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 "Endurraða síðum"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "_Tölvupóstur"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "_Síða"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "Snúa til _vinstri"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "Snúa til _hægri"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "_Utansníða"
+
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "_Ekkert"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+msgid "_Letter"
+msgstr "_Bréfsefni"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+msgid "Le_gal"
+msgstr "_Löggilt"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+msgid "4×6"
+msgstr "4×6"
+
+#. Radio button for cropping page to A3
+#: src/app-window.ui:397
+msgid "A_3"
+msgstr "A_3"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:408
+msgid "_Custom"
+msgstr "Sérs_niðið"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:426
+msgid "_Rotate Crop"
+msgstr "Snúa utansku_rði"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:439
+msgid "Move Left"
+msgstr "Færa til vinstri"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:448
+msgid "Move Right"
+msgstr "Færa til hægri"
+
+#. Label on help menu
+#: src/app-window.ui:485
+msgid "_Help"
+msgstr "_Hjálp"
+
+#. Help|Contents menu
+#: src/app-window.ui:493
+msgid "_Contents"
+msgstr "_Efni"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:531 src/app-window.ui:731
+msgid "Scan a single page from the scanner"
+msgstr "Skanna eina síðu úr skannanum"
+
+#. Label on scan toolbar item
+#: src/app-window.ui:533 src/app-window.ui:727
+msgid "Scan"
+msgstr "Skanna"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:549 src/app-window.ui:798
+msgid "Save document to a file"
+msgstr "Vista skjal sem skrá"
+
+#: src/app-window.ui:551
+msgid "Save"
+msgstr "Vista"
+
+#. Tooltip for stop button
+#: src/app-window.ui:566 src/app-window.ui:711
+msgid "Stop the current scan"
+msgstr "Stöðva skönnun sem er í gangi"
+
+#: src/app-window.ui:567 src/app-window.ui:708
+msgid "Stop"
+msgstr "Stöðva"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:622
+msgid "Searching for Scanners…"
+msgstr "Leita að skönnum…"
+
+#: src/app-window.vala:239 src/app-window.vala:1391
+msgid "_Close"
+msgstr "_Loka"
+
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:248
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Notandanafn og lykilorð þarf til að fá aðgang að “%s”"
+
+#. Label shown when detected a scanner
+#: src/app-window.vala:268 src/app-window.vala:586
+msgid "Ready to Scan"
+msgstr "Tilbúið til skönnunar"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:275
+msgid "Additional software needed"
+msgstr "Viðbótarhugbúnaður er nauðsynlegur"
+
+#. Instructions to install driver software
+#: src/app-window.vala:277
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr ""
+"Þú þarft að <a href=\"install-firmware\">setja upp hugbúnað með"
+" vélbúnaðarreklum</a> fyrir skannann þinn."
+
+#. Warning displayed when no scanners are detected
+#: src/app-window.vala:283
+msgid "No scanners detected"
+msgstr "Engir skannar fundust"
+
+#. Hint to user on why there are no scanners detected
+#: src/app-window.vala:285
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+"Gakktu úr skugga um að skanninn þinn sé tengdur og að kveikt sé á honum"
+
+#. Save dialog: Dialog title
+#: src/app-window.vala:300
+msgid "Save As…"
+msgstr "Vista sem…"
+
+#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
+msgid "_Cancel"
+msgstr "_Hætta við"
+
+#: src/app-window.vala:304 src/app-window.vala:555
+msgid "_Save"
+msgstr "Vi_sta"
+
+#. Default filename to use when saving document
+#: src/app-window.vala:312
+msgid "Scanned Document.pdf"
+msgstr "Skannað skjal.pdf"
+
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:318
+msgid "Image Files"
+msgstr "Myndskrár"
+
+#. Save dialog: Filter name to show all files
+#: src/app-window.vala:328
+msgid "All Files"
+msgstr "Allar skrár"
+
+#. Save dialog: Label for saving in PDF format
+#: src/app-window.vala:337
+msgid "PDF (multi-page document)"
+msgstr "PDF (margsíðna skjal)"
+
+#. Save dialog: Label for saving in JPEG format
+#: src/app-window.vala:343
+msgid "JPEG (compressed)"
+msgstr "JPEG (þjappað)"
+
+#. Save dialog: Label for saving in PNG format
+#: src/app-window.vala:349
+msgid "PNG (lossless)"
+msgstr "PNG (taplaust)"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:356
+msgid "WebP (compressed)"
+msgstr "WebP (þjappað)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:366
+msgid "File format:"
+msgstr "Skráasnið:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:378
+msgid "Compression:"
+msgstr "Þjöppun:"
+
+#. 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
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Það er þegar til skrá sem heitir '%s'. Viltu skipta henni út?"
+
+#. 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
+msgid "_Replace"
+msgstr "Ski_pta út"
+
+#: src/app-window.vala:514
+msgid "Saving"
+msgstr "Vista"
+
+#. Title of error dialog when save failed
+#: src/app-window.vala:529
+msgid "Failed to save file"
+msgstr "Tókst ekki að vista skrá"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:552
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Ef þú vistar ekki munu allar breytingar glatast."
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:593
+msgid "Save current document?"
+msgstr "Vista þetta skjal?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: src/app-window.vala:595
+msgid "Discard Changes"
+msgstr "Henda breytingum"
+
+#. Label shown when scan started
+#: src/app-window.vala:694
+msgid "Contacting scanner…"
+msgstr "Hef samband við skanna…"
+
+#. Error message display when unable to save image for preview
+#: src/app-window.vala:804
+msgid "Unable to save image for preview"
+msgstr "Ekki tókst að vista mynd fyrir forskoðun"
+
+#. Error message display when unable to preview image
+#: src/app-window.vala:816
+msgid "Unable to open image preview application"
+msgstr "Ekki tókst að opna forskoðunarforrit"
+
+#. Label on button for combining sides in reordering dialog
+#: src/app-window.vala:1001
+msgid "Combine sides"
+msgstr "Sameina hliðar"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/app-window.vala:1011
+msgid "Combine sides (reverse)"
+msgstr "Sameina hliðar (öfugt)"
+
+#. Label on button for reversing in reordering dialog
+#: src/app-window.vala:1021
+msgid "Reverse"
+msgstr "Snúa við"
+
+#. Label on button for cancelling page reordering dialog
+#: src/app-window.vala:1031
+msgid "Keep unchanged"
+msgstr "Halda óbreyttu"
+
+#. Error message displayed when unable to launch help browser
+#: src/app-window.vala:1261
+msgid "Unable to open help file"
+msgstr "Get ekki opnað hjálparskrána"
+
+#. The license this software is under (GPL3+)
+#: src/app-window.vala:1282
+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"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Þetta forrit er frjáls hugbúnaður; þú mátt endurrita hann og/eða breyta "
+"samkvæmt skilmálum \"GNU General Public License\" eins og það er útgefið af "
+"\"Free Software Foundation;\"; annað hvort útgáfa 3 af leyfinu, eða (að þínu "
+"vali) einhver síðari útgáfa.\n"
+"\n"
+"Þessu forriti er dreift í þeirri von að það sé gagnlegt, en ÁN NOKKURAR "
+"ÁBYRGÐAR; einnig án óbeinnar SÖLUÁBYRGÐAR eða HÆFNI TIL NOKKURS HLUTAR. Sjá "
+"nánar í \"GNU General Public License\" leyfinu.\n"
+"\n"
+"Þú ættir að hafa fengið afrit af \"GNU General Public License\" með þessu "
+"forriti; ef ekki, skrifaðu til Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301, USA <http://www.gnu.org/licenses/"
+">."
+
+#. Title of about dialog
+#: src/app-window.vala:1285
+msgid "About Simple Scan"
+msgstr "Um einfalda skönnunarforritið Simple Scan"
+
+#. Description of program
+#: src/app-window.vala:1288
+msgid "Simple document scanning tool"
+msgstr "Einfalt verkfæri til skönnunar á skjölum"
+
+#: src/app-window.vala:1297
+msgid "translator-credits"
+msgstr "Sveinn í Felli, sv1@fellsnet.is"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1319
+msgid "Save document before quitting?"
+msgstr "Vista breytingar á skjalinu áður en þú hættir?"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1321
+msgid "Quit without Saving"
+msgstr "Hætta án þess að vista"
+
+#. Message to indicate a Brother scanner has been detected
+#: src/app-window.vala:1368
+msgid "You appear to have a Brother scanner."
+msgstr "Það lítur út fyrir að þú sért með Brother-skanna."
+
+#. Instructions on how to install Brother scanner drivers
+#: src/app-window.vala:1370
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+"Vélbúnaðarreklar fyrir þennan skanna ættu að vera til taks á <a"
+" href=\"http://support.brother.com\">Brother vefsvæðinu</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: src/app-window.vala:1374
+msgid "You appear to have a Samsung scanner."
+msgstr "Það lítur út fyrir að þú sért með Samsung-skanna."
+
+#. Instructions on how to install Samsung scanner drivers
+#: src/app-window.vala:1376
+msgid ""
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
+msgstr ""
+"Vélbúnaðarreklar fyrir þennan skanna ættu að vera til taks á <a"
+" href=\"http://samsung.com/support\">Samsung vefsvæðinu</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: src/app-window.vala:1380
+msgid "You appear to have an HP scanner."
+msgstr "Það lítur út fyrir að þú sért með HP-skanna."
+
+#. Message to indicate an Epson scanner has been detected
+#: src/app-window.vala:1385
+msgid "You appear to have an Epson scanner."
+msgstr "Það lítur út fyrir að þú sért með Epson-skanna."
+
+#. Instructions on how to install Epson scanner drivers
+#: src/app-window.vala:1387
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+"Vélbúnaðarreklar fyrir þennan skanna ættu að vera til taks á <a"
+" href=\"http://support.epson.com\">Epson vefsvæðinu</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: src/app-window.vala:1391
+msgid "Install drivers"
+msgstr "Setja upp vélbúnaðarrekla"
+
+#. Message in driver install dialog
+#: src/app-window.vala:1422
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+"Þegar uppsetningu er lokið, verður þú að endurræsa Simple Scan"
+" skönnunarforritið."
+
+#. Label shown while installing drivers
+#: src/app-window.vala:1434
+msgid "Installing drivers…"
+msgstr "Set inn rekla…"
+
+#. Label shown once drivers successfully installed
+#: src/app-window.vala:1442
+msgid "Drivers installed successfully!"
+msgstr "Uppsetningu rekla er lokið!"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1452
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Mistókst að setja inn vélbúnaðarrekla (villukóði %d)."
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1458
+msgid "Failed to install drivers."
+msgstr "Mistókst að setja inn vélbúnaðarrekla."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/app-window.vala:1465
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Þú þarft að setja upp %s pakkann."
+msgstr[1] "Þú þarft að setja upp %s pakkana."
+
+#: src/app-window.vala:1585
+msgid "Email"
+msgstr "Tölvupóstur"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Kjörstillingar"
+
+#: src/app-window.vala:1590
+msgid "Keyboard Shortcuts"
+msgstr "Flýtileiðir á lyklaborði"
+
+#: src/app-window.vala:1591
+msgid "Help"
+msgstr "Hjálp"
+
+#: src/app-window.vala:1592
+msgid "About"
+msgstr "Um hugbúnaðinn"
+
+#. 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
+msgid "Start Again…"
+msgstr "Byrja aftur…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1617
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Snúa síðunni til vinstri (rangsælis)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1624
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Snúa síðunni til hægri (réttsælis)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1634
+msgid "Crop the selected page"
+msgstr "Skera utan af valinni síðu"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1650
+msgid "Delete the selected page"
+msgstr "Eyða valinni síðu"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1815
+msgid "Cancel"
+msgstr "Hætta við"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Heimil_a"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Notandanafn fyrir tilfan_gið:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Lykilorð:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Tókst ekki að kóða síðu %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skönnun"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skanna eina síðu"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skanna allar síður úr síðumatara"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skanna margendurtekið úr flatskanna"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stöðva skönnun sem er í gangi"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Breytingar á skjölum"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Færa síðu til vinstri"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Færa síðu til hægri"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Snúa síðu til vinstri (rangsælis)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Snúa síðu til hægri (réttsælis)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Eyða síðu"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Skjalastjórnun"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Byrja nýtt skjal"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Vista skannað skjal"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Tölvupóstsenda skannað skjal"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Prenta skannað skjal"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Afrita valda síðu á klippispjald"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skanni"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skannaðar hliðar"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Blaðsíðustærð"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Framhlið"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Bakhlið"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Bæði"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Seinkun"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Margar síður úr flatskanna"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "sekúndur"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skönnun"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Upplausn _texta"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "U_pplausn ljósmyndar"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Birtustig"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Birtuskil"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Gæði"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Sjálfvirkt"
+
+#: src/preferences-dialog.vala:118
+msgid "Darker"
+msgstr "Dekkra"
+
+#: src/preferences-dialog.vala:120
+msgid "Lighter"
+msgstr "Ljósara"
+
+#: src/preferences-dialog.vala:128
+msgid "Less"
+msgstr "Minna"
+
+#: src/preferences-dialog.vala:130
+msgid "More"
+msgstr "Meira"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:442
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d pát (sjálfgefið)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:445
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d pát (uppkast)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:448
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d pát (háupplausn)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:451
+#, c-format
+msgid "%d dpi"
+msgstr "%d pát"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Engir skannar fundust. Tengdu skanna við tölvuna."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Ekki tókst að tengjast skanna"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Get ekki ræst skönnun"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1347
+msgid "Error communicating with scanner"
+msgstr "Villa í samskiptum við skanna"
+
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Sýna útgáfunúmer"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Birta villgreiningarboð"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Laga PDF-skrár sem útbúnar hafa verið með eldri útgáfum einfalda"
+" skönnunarforritsins Simple Scan"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:393
+msgid "Failed to scan"
+msgstr "Mistókst að skanna"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:408
+msgid "Scan in progress"
+msgstr "Skönnun í gangi"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:585
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — Skönnunartól"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:596
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Keyrðu '%s --help' til að sjá lista með öllum mögulegum valkostum"
+" skipanalínunnar."
+
+
diff --git a/po/it.po b/po/it.po
index 8851239..6c28902 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,14 +1,15 @@
 # Italian translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2017, 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the simple-scan package.
-# Gianvito Cavasoli <gianvito@gmx.it>, 2017, 2018.
+# Gianvito Cavasoli <gianvito@gmx.it>, 2017-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-08-26 21:44+0000\n"
-"PO-Revision-Date: 2018-08-30 13:36+0200\n"
+"POT-Creation-Date: 2019-02-18 16:09+0000\n"
+"PO-Revision-Date: 2019-02-15 11:18+0100\n"
 "Last-Translator: Gianvito Cavasoli <gianvito@gmx.it>\n"
 "Language-Team: Italiano <gnome-it-list@gnome.org>\n"
 "Language: it\n"
@@ -16,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -137,7 +138,7 @@ msgstr "Ritardo tra le pagine in millisecondi."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1266 src/app-window.vala:1520
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -177,207 +178,152 @@ msgstr "scan;scanner;scansiona;adf;acquisizione;"
 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 "_Pagina singola"
-
-#. 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 "_Tutte le pagine dall'alimentatore documenti"
-
-#. 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 "Pagine _multiple dallo scanner"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Testo"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Foto"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Documento"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "_Acquisisci"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "Interrompi acqui_sizione"
-
-#. 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 "Riordina pagine"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_Email"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Pagina"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Ruota a _sinistra"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Ruota a _destra"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Ritaglia"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Nessuno"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Lettera"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gale"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Personalizzato"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Ruota ritaglio"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Sposta a sinistra"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Sposta a destra"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "A_iuto"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Sommario"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Interrompi"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Acquisisce una pagina singola dallo scanner"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Interrompe l'acquisizione in corso"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Acquisisci"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Acquisisce una pagina singola dallo scanner"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Salva il documento su un file"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Salva"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "Pagina _singola"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Interrompe l'acquisizione in corso"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "_Tutte le pagine dall'alimentatore documenti"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Interrompi"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "Pagine _multiple dallo scanner"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Ricerca degli scanner…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Testo"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Immagine"
+
+#: src/app-window.vala:221 src/app-window.vala:1353
 msgid "_Close"
 msgstr "_Chiudi"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:230
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Sono richiesti nome utente e password per accedere a «%s»"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:246
+msgid "Searching for Scanners…"
+msgstr "Ricerca degli scanner…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:252
 msgid "Ready to Scan"
 msgstr "Pronto per l'acquisizione"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:259
 msgid "Additional software needed"
 msgstr "Software aggiuntivo necessario"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:261
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -386,151 +332,157 @@ msgstr ""
 "a> dello scanner."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:267
 msgid "No scanners detected"
 msgstr "Nessuno scanner rilevato"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:269
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controllare che lo scanner sia collegato e acceso"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:292
 msgid "Save As…"
 msgstr "Salva come…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "A_nnulla"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:295 src/app-window.vala:549
 msgid "_Save"
 msgstr "_Salva"
 
+#: src/app-window.vala:296 src/app-window.vala:464 src/app-window.vala:548
+msgid "_Cancel"
+msgstr "A_nnulla"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:303
 msgid "Scanned Document.pdf"
 msgstr "Documento acquisito.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:309
 msgid "Image Files"
 msgstr "File immagine"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:319
 msgid "All Files"
 msgstr "Tutti i file"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:328
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-pagina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:334
 msgid "JPEG (compressed)"
 msgstr "JPEG (compresso)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:340
 msgid "PNG (lossless)"
 msgstr "PNG (senza perdita)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:347
 msgid "WebP (compressed)"
 msgstr "WebP (compresso)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:357
 msgid "File format:"
 msgstr "Formato file:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:369
 msgid "Compression:"
 msgstr "Compressione:"
 
 #. 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:463
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Un file con il nome «%s» esiste già. Sostituirlo?"
 
 #. 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:466
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:505
 msgid "Saving"
 msgstr "Salvataggio"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Salvataggio file non riuscito"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:546
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Se non si salva, le modifiche saranno perse per sempre."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:582
 msgid "Save current document?"
 msgstr "Salvare il documento corrente?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:584
 msgid "Discard Changes"
 msgstr "Scarta le modifiche"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:717
 msgid "Contacting scanner…"
 msgstr "Scanner in contatto…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Impossibile salvare l'immagine per l'anteprima"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr ""
 "Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:974
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Riordino delle pagine"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:997
 msgid "Combine sides"
 msgstr "Unisci lati"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1007
 msgid "Combine sides (reverse)"
 msgstr "Unisci lati (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1017
 msgid "Reverse"
 msgstr "Inverso"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1027
 msgid "Keep unchanged"
 msgstr "Mantieni non modificato"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1241
 msgid "Unable to open help file"
 msgstr "Impossibile aprire il file di aiuto"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1256
 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"
@@ -560,16 +512,16 @@ msgstr ""
 ">."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1259 src/app-window.vala:1541
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1262
 msgid "Simple document scanning tool"
 msgstr "Semplice strumento per l'acquisizione di documenti"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1271
 msgid "translator-credits"
 msgstr ""
 "Gianvito Cavasoli <gianvito@gmx.it>\n"
@@ -577,22 +529,22 @@ msgstr ""
 "...e un ringraziamento ai precedenti traduttori da Rosetta."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1287
 msgid "Save document before quitting?"
 msgstr "Salvare il documento prima di uscire?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1289
 msgid "Quit without Saving"
 msgstr "Esci senza salvare"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1330
 msgid "You appear to have a Brother scanner."
 msgstr "Sembra essere uno scanner «Brother»."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1332
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -601,12 +553,12 @@ msgstr ""
 "support.brother.com\">sito web Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1336
 msgid "You appear to have a Samsung scanner."
 msgstr "Sembra essere uno scanner «Samsung»."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1338
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -615,17 +567,17 @@ msgstr ""
 "samsung.com/support\">sito web Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1342
 msgid "You appear to have an HP scanner."
 msgstr "Sembra essere uno scanner «HP»."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1347
 msgid "You appear to have an Epson scanner."
 msgstr "Sembra essere uno scanner «Epson»."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1349
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -634,111 +586,112 @@ msgstr ""
 "Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1353
 msgid "Install drivers"
 msgstr "Installare i driver"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1386
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Una volta completata l'installazione sarà necessario riavviare "
 "l'applicazione."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1399
 msgid "Installing drivers…"
 msgstr "Installazione dei driver…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1407
 msgid "Drivers installed successfully!"
 msgstr "Driver installati con successo."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1417
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Installazione dei driver non riuscita (codice errore %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1423
 msgid "Failed to install drivers."
 msgstr "Installazione driver non riuscita."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1430
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "È necessario installare il pacchetto %s."
 msgstr[1] "È necessario installare i pacchetti %s."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1534
 msgid "Email"
-msgstr "Email"
+msgstr "Posta elettronica"
+
+#: src/app-window.vala:1535
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Riordina pagine"
 
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1538 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1539
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1540
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Informazioni"
-
 #. 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:1549
 msgid "Start Again…"
 msgstr "Avvia di nuovo…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1568
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Ruota la pagina a sinistra (senso antiorario)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1577
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Ruota la pagina a destra (senso orario)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1589
 msgid "Crop the selected page"
 msgstr "Ritaglia la pagina selezionata"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1607
 msgid "Delete the selected page"
 msgstr "Elimina la pagina selezionata"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1751
 msgid "Cancel"
 msgstr "Annulla"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Autorizza"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Nome utente per la risorsa:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "Pass_word:"
 
@@ -820,7 +773,7 @@ msgstr "Salva il documento acquisito"
 #: src/help-overlay.ui:106
 msgctxt "shortcut window"
 msgid "Email scanned document"
-msgstr "Invia per email il documento acquisito"
+msgstr "Invia per posta elettronica il documento acquisito"
 
 #: src/help-overlay.ui:113
 msgctxt "shortcut window"
@@ -833,146 +786,146 @@ msgid "Copy current page to clipboard"
 msgstr "Copia l'attuale pagina negli appunti"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Scanner"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Lati acquisizione"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Dimensione pagina"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Fronte"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Retro"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Entrambi"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Ritardo"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Pagine multiple dallo scanner"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Secondi"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Acquisizione"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Risoluzione _testo"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Risoluzione _foto"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Luminosità"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Contrasto"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Qualità"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Più scura"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Più chiara"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Minore"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Maggiore"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinita)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (bozza)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta risoluzione)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -988,12 +941,12 @@ msgid "Unable to connect to scanner"
 msgstr "Impossibile connettersi allo scanner"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Impossibile avviare l'acquisizione"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Errore di comunicazione con lo scanner"
 
diff --git a/po/ja.po b/po/ja.po
index 42f9777..d237316 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,533 +6,474 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-04-16 08:54-0400\n"
-"PO-Revision-Date: 2014-11-20 05:14+0000\n"
-"Last-Translator: Kentaro Kazuhama <Unknown>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
+"POT-Creation-Date: 2019-02-07 01:56+0000\n"
+"PO-Revision-Date: 2019-02-08 00:45+0900\n"
+"Last-Translator: sicklylife <translation@sicklylife.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Launchpad (build 18361)\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: src/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "認証(_A)"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "スキャンするデバイス"
 
-#. Label beside username entry
-#: src/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "リソースに対するユーザ名(_U):"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "画像を取得する SANE デバイスです。"
 
-#. Label beside password entry
-#: src/simple-scan.ui:117
-msgid "_Password:"
-msgstr "パスワード(_P):"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "スキャンするドキュメントの種類"
 
-#. Combo box label for scanning both sides of a page
-#: src/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "表面と裏面"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"スキャンされる文書の種類。この設定により、画像の解像度、色の深度、事後処理が"
+"決定されます。"
 
-#. Combo box label for scanning the front side of a page
-#: src/simple-scan.ui:192
-msgid "Front"
-msgstr "表面"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "10mm単位での紙の幅"
 
-#. Combo box label for scanning the back side of a page
-#: src/simple-scan.ui:196
-msgid "Back"
-msgstr "戻る"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "10mm単位の用紙の幅 (または自動用紙検知の場合は 0)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "10mm単位の用紙の高さ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "10mm単位の紙の高さ (または 0 で自動紙検知)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "スキャンの明るさ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "-100から100までの範囲で明るさを調節する (0は無調整)。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "スキャンのコントラスト"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "-100から100までの範囲でコントラストを調節する (0は無調整)。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "テキストスキャンの解像度"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "テキストをスキャンするときの解像度(DPI)です。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "写真スキャンの解像度"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "写真をスキャンするときの解像度(DPI)です。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "スキャンする面"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "スキャンされる面"
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "ファイルを保存するディレクトリ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"ファイルを保存するディレクトリです。設定されていない場合、標準でドキュメント"
+"ディレクトリに保存されます。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEGの圧縮に使用する品質の値"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEGの圧縮に使用する品質の値です。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "ページ間におけるミリ秒単位の遅延時間"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "ページ間におけるミリ秒単位の遅延時間です。"
 
 #. Title of scan window
-#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
-#: data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. 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:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "シンプルスキャン"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/simple-scan.ui:247
-msgid "_Document"
-msgstr "ドキュメント(_D)"
-
-#. Scan menu item
-#: src/simple-scan.ui:266
-msgid "Sc_an"
-msgstr "スキャン(_A)"
-
-#. Scan menu item to scan a single page from the scanner
-#. Toolbar scan menu item to scan a single page from the scanner
-#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
-msgid "Single _Page"
-msgstr "一枚のページ(_P)"
-
-#. Scan menu item to scan all pages from a document feeder
-#. Toolbar scan menu item to scan all pages from a document feeder
-#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
-msgid "All Pages From _Feeder"
-msgstr "フィーダより全てのページ(_F)"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "ドキュメントをスキャンします"
 
-#. Scan menu item to scan continuously from the flatbed
-#. Toolbar scan menu item to scan continuously from the flatbed
-#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
-msgid "_Multiple Pages From Flatbed"
+#: 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 ""
+"ドキュメントや写真を本当に簡単な方法でスキャンします。写真の不要な部分を切り"
+"取ったり、間違った方向に向いている場合は回転できます。スキャンしたものを印"
+"刷、PDFへのエクスポート、多くの画像フォーマットに保存することができます。"
 
-#. Menu entry to stop current scan
-#: src/simple-scan.ui:310
-msgid "_Stop Scan"
-msgstr "スキャン停止(_S)"
-
-#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
-msgid "Text"
-msgstr "テキスト"
-
-#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
-msgid "Photo"
-msgstr "写真"
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"シンプルスキャンはSANEフレームワークを採用しており、多数の既存スキャナーに対"
+"応しています。"
 
-#. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
-msgid "Reorder Pages"
-msgstr "ページを再整列"
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "ドキュメントスキャナー"
 
-#. Label on email menu item
-#: src/simple-scan.ui:371
-msgid "_Email"
-msgstr "電子メール(_E)"
+#. 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
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"scan;scanner;flatbed;adf;スキャン;スキャナー;フラットベッド;オートドキュメン"
+"トフィーダ;自動給紙装置;"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/simple-scan.ui:436
-msgid "_Page"
-msgstr "ページ(_P)"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/simple-scan.ui:446
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "左へ回転(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/simple-scan.ui:456
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "右へ回転(_R)"
 
 #. Label for page crop submenu
-#: src/simple-scan.ui:466
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "切り抜き(_C)"
 
 #. Radio button for no crop
-#: src/simple-scan.ui:476
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "なし(_N)"
 
 #. Radio button for cropping page to A4 size
-#: src/simple-scan.ui:487
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/simple-scan.ui:498
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/simple-scan.ui:509
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/simple-scan.ui:520
+#: src/app-window.ui:76
 msgid "_Letter"
-msgstr "US レター(_L)"
+msgstr "USレター(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: src/simple-scan.ui:531
+#: src/app-window.ui:86
 msgid "Le_gal"
-msgstr "US リーガル(_G)"
+msgstr "USリーガル(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/simple-scan.ui:542
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
+#. Radio button for cropping page to A3
+#: src/app-window.ui:106
+msgid "A_3"
+msgstr "A_3"
+
 #. Radio button for cropping to custom page size
-#: src/simple-scan.ui:553
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "カスタム(_C)"
 
 #. Menu item to rotate the crop area
-#: src/simple-scan.ui:571
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "切り抜きを回転(_R)"
 
 #. Menu item to move the selected page to the left
-#: src/simple-scan.ui:584
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "左へ移動"
 
 #. Menu item to move the selected page to the right
-#: src/simple-scan.ui:593
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "右へ移動"
 
-#. Label on help menu
-#: src/simple-scan.ui:630
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#. Help|Contents menu
-#: src/simple-scan.ui:638
-msgid "_Contents"
-msgstr "コンテンツ(_C)"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "停止"
 
-#. Tooltip for new document button
-#: src/simple-scan.ui:680 src/simple-scan.ui:891
-msgid "Start a new document"
-msgstr "新規ドキュメントの作成"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "スキャンを停止します"
 
-#: src/simple-scan.ui:681
-msgid "New"
-msgstr "新規"
+#. Label on scan toolbar item
+#: src/app-window.ui:285
+msgid "Scan"
+msgstr "スキャン"
 
 #. Tooltip for scan toolbar button
-#: src/simple-scan.ui:695 src/simple-scan.ui:842
+#: src/app-window.ui:288
 msgid "Scan a single page from the scanner"
 msgstr "一枚のページをスキャンします"
 
-#. Label on scan toolbar item
-#: src/simple-scan.ui:697 src/simple-scan.ui:843
-msgid "Scan"
-msgstr "スキャン"
-
 #. Tooltip for save toolbar button
-#: src/simple-scan.ui:713 src/simple-scan.ui:870
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "ドキュメントをファイルに保存"
 
-#: src/simple-scan.ui:715 src/ui.vala:1892
-msgid "Save"
-msgstr "保存"
-
-#. Tooltip for stop button
-#: src/simple-scan.ui:730 src/simple-scan.ui:830
-msgid "Stop the current scan"
-msgstr "スキャンを停止します"
-
-#: src/simple-scan.ui:731 src/simple-scan.ui:831
-msgid "Stop"
-msgstr "停止"
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: src/simple-scan.ui:755 src/simple-scan.ui:942
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "ページを左回転 (反時計回り)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: src/simple-scan.ui:756
-msgid "Rotate Left"
-msgstr "左へ回転"
-
-#. Tooltip for rotate right (clockwise) button
-#: src/simple-scan.ui:770 src/simple-scan.ui:920
-msgid "Rotate the page to the right (clockwise)"
-msgstr "ページを右回転 (時計回り)"
-
-#. Label on rotate page right (clockwise) item
-#: src/simple-scan.ui:771
-msgid "Rotate Right"
-msgstr "右へ回転"
-
-#: src/simple-scan.ui:785 src/simple-scan.ui:969
-msgid "Crop the selected page"
-msgstr "選択した範囲の切り抜き"
-
-#: src/simple-scan.ui:787
-msgid "Crop"
-msgstr "切り抜き"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "一枚のページ(_S)"
 
-#. Title of preferences dialog
-#: src/simple-scan.ui:1003 src/ui.vala:1898
-msgid "Preferences"
-msgstr "設定"
-
-#. Label beside scan source combo box
-#: src/simple-scan.ui:1054
-msgid "Scan S_ource:"
-msgstr "スキャンする対象(_O):"
-
-#. Label beside scan source combo box
-#: src/simple-scan.ui:1085
-msgid "_Text Resolution:"
-msgstr "テキストの画素数(_T):"
-
-#. Label beside scan source combo box
-#: src/simple-scan.ui:1101
-msgid "_Photo Resolution:"
-msgstr "写真の画素数(_P):"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "フィーダーからすべてのページ(_F)"
 
-#. Label beside scan side combo box
-#: src/simple-scan.ui:1145
-msgid "Scan Side:"
-msgstr "スキャン面:"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "フラットベッドから複数のページ(_M)"
 
-#. Label beside page size combo box
-#: src/simple-scan.ui:1175
-msgid "Page Size:"
-msgstr "ページサイズ:"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "テキスト(_T)"
 
-#. Label beside brightness scale
-#: src/simple-scan.ui:1205
-msgid "Brightness:"
-msgstr "明るさ:"
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "画像(_I)"
 
-#. Label beside contrast scale
-#: src/simple-scan.ui:1235
-msgid "Contrast:"
-msgstr "コントラスト:"
+#: src/app-window.vala:223 src/app-window.vala:1352
+msgid "_Close"
+msgstr "閉じる(_C)"
 
-#. Label beside quality scale
-#: src/simple-scan.ui:1266
-msgid "Quality:"
-msgstr "品質:"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:232
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "“%s”へのアクセスに必要なユーザー名とパスワード"
 
-#. Label beside page delay scale
-#: src/simple-scan.ui:1297
-msgid "Delay between pages:"
-msgstr ""
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "スキャナーを検索中…"
 
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "ドキュメントスキャナ―"
+#. Label shown when detected a scanner
+#: src/app-window.vala:254
+msgid "Ready to Scan"
+msgstr "スキャン準備完了"
 
-#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
-msgid "Scan Documents"
-msgstr "ドキュメントをスキャンします"
-
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;スキャン;スキャナー;フラットベッド;オートドキュメントフィーダ;自動給紙装置;"
-
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:261
+msgid "Additional software needed"
+msgstr "追加ソフトウェアが必要です"
 
-#: data/simple-scan.appdata.xml.in:9
+#. Instructions to install driver software
+#: src/app-window.vala:263
 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."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"ドキュメントや写真を本当に簡単な方法でスキャンします。写真の不要な部分を切り取ったり、間違った方向に向いている場合は回転できます。スキャンしたものを印刷、"
-"PDFへのエクスポート、多くの画像フォーマットに保存することができます。"
-
-#: data/simple-scan.appdata.xml.in:14
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr "シンプル スキャンはSANE フレームワークを採用しており、多数の既存スキャナに対応しています。"
-
-#. Error displayed when no scanners to scan with
-#: src/scanner.vala:844
-msgid "No scanners available.  Please connect a scanner."
-msgstr "利用可能なスキャナがありません。スキャナを接続してください。"
-
-#. Error displayed when cannot connect to scanner
-#: src/scanner.vala:874
-msgid "Unable to connect to scanner"
-msgstr "スキャナに接続できません"
-
-#. Error display when unable to start scan
-#: src/scanner.vala:1227
-msgid "Unable to start scan"
-msgstr "スキャンを開始できません"
-
-#. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1340
-msgid "Error communicating with scanner"
-msgstr "スキャナとの通信に失敗しました"
-
-#. Help string for command line --version flag
-#: src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "リリースバージョンを表示"
-
-#. Help string for command line --debug flag
-#: src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "デバッグメッセージを表示"
-
-#: src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr "古いバージョンの Simple Scan によって生成されたPDFファイルを修復する"
-
-#. Title of error dialog when scan failed
-#: src/simple-scan.vala:389
-msgid "Failed to scan"
-msgstr "スキャンに失敗しました"
-
-#. Arguments and description for --help text
-#: src/simple-scan.vala:619
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[デバイス...] - スキャンユーティリティ"
-
-#. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:630
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr "'%s --help' を実行すると利用可能なすべてのコマンドラインオプションの一覧が表示されます"
-
-#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
-msgid "_Close"
-msgstr "閉じる(_C)"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: src/ui.vala:341
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "'%s' にアクセスするにはユーザ名とパスワードが必要です"
+"スキャナーの<a href=\"install-firmware\">ドライバーソフトウェアをインストール"
+"</a>する必要があります。"
 
 #. Warning displayed when no scanners are detected
-#: src/ui.vala:389
+#: src/app-window.vala:269
 msgid "No scanners detected"
-msgstr "スキャナが検出されていません"
+msgstr "スキャナーが検出されていません"
 
 #. Hint to user on why there are no scanners detected
-#: src/ui.vala:391
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
-msgstr "スキャナが接続されて電源が入っているか確認してください"
-
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/ui.vala:396
-msgid "Additional software needed"
-msgstr "追加ソフトウェアが必要です"
-
-#. Instructions to install driver software
-#: src/ui.vala:398
-msgid "You need to install driver software for your scanner."
-msgstr "スキャナに対応したドライバー ソフトウェアをインストールする必要があります。"
+msgstr "スキャナーが接続されて電源が入っているか確認してください"
 
 #. Save dialog: Dialog title
-#: src/ui.vala:510
-msgid "Save As..."
-msgstr "名前を付けて保存..."
+#: src/app-window.vala:294
+msgid "Save As…"
+msgstr "名前を付けて保存…"
 
-#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
-msgid "_Cancel"
-msgstr "キャンセル(_C)"
-
-#: src/ui.vala:514 src/ui.vala:724
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "保存(_S)"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
 #. Default filename to use when saving document
-#: src/ui.vala:522
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "スキャンされたドキュメント.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: src/ui.vala:528
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "画像ファイル"
 
 #. Save dialog: Filter name to show all files
-#: src/ui.vala:534
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "すべてのファイル"
 
 #. Save dialog: Label for saving in PDF format
-#: src/ui.vala:543
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (複数ページ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/ui.vala:549
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (圧縮済み)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/ui.vala:555
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (ロスレス)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: src/ui.vala:564
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:349
+msgid "WebP (compressed)"
+msgstr "WebP (圧縮済み)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "ファイルフォーマット:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:371
+msgid "Compression:"
+msgstr "圧縮率:"
+
 #. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
-#: src/ui.vala:647
+#: src/app-window.vala:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr ""
+msgstr "“%s”はすでに存在します。上書きしてもよろしいですか?"
 
 #. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
-#: src/ui.vala:650
+#: src/app-window.vala:468
 msgid "_Replace"
-msgstr ""
+msgstr "上書き(_R)"
+
+#: src/app-window.vala:507
+msgid "Saving"
+msgstr "保存中"
 
 #. Title of error dialog when save failed
-#: src/ui.vala:698
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "ファイルの保存に失敗しました"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/ui.vala:721
-msgid "If you don't save, changes will be permanently lost."
-msgstr "保存しない場合、変更点は失われます。"
+#: src/app-window.vala:545
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "保存しない場合、変更は永久に失われます。"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/ui.vala:763
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "現在のドキュメントを保存しますか?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/ui.vala:765
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "変更を破棄"
 
+#. Label shown when scan started
+#: src/app-window.vala:716
+msgid "Contacting scanner…"
+msgstr "スキャナーと通信中…"
+
 #. Error message display when unable to save image for preview
-#: src/ui.vala:1056
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "プレビュー用の画像を保存できません"
 
 #. Error message display when unable to preview image
-#: src/ui.vala:1068
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "画像プレビューアプリケーションを開けませんでした"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "ページを再整列"
+
 #. Label on button for combining sides in reordering dialog
-#: src/ui.vala:1270
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "面を結合"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/ui.vala:1280
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
-msgstr "面を結合(逆順)"
+msgstr "面を結合 (逆順)"
 
 #. Label on button for reversing in reordering dialog
-#: src/ui.vala:1290
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "逆順"
 
 #. Label on button for cancelling page reordering dialog
-#: src/ui.vala:1300
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "無変更を維持"
 
 #. Error message displayed when unable to launch help browser
-#: src/ui.vala:1504
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "ヘルプファイルを開くことができません"
 
 #. The license this software is under (GPL3+)
-#: src/ui.vala:1525
+#: src/app-window.vala:1255
 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"
@@ -561,16 +502,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/ui.vala:1528
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
-msgstr "Simple Scan について"
+msgstr "シンプルスキャンについて"
 
 #. Description of program
-#: src/ui.vala:1531
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: src/ui.vala:1540
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -582,202 +523,548 @@ msgstr ""
 "  Kentaro Kazuhama https://launchpad.net/~kazken3\n"
 "  Koichi Akabe https://launchpad.net/~vbkaisetsu\n"
 "  MANABE Akinari https://launchpad.net/~maaanaari\n"
+"  Shinichirou Yamada https://launchpad.net/~yamada-strong-yamada-nice-64bit\n"
 "  Shushi Kurose https://launchpad.net/~kuromabo\n"
 "  Tosiki Iga https://launchpad.net/~tosiki-iga\n"
+"  Hideki Yamane https://launchpad.net/~henrich\n"
+"  id:sicklylifehttps://launchpad.net/~sicklylife\n"
 "  kaneisland https://launchpad.net/~kaneisland"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/ui.vala:1562
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "終了する前にドキュメントを保存しますか?"
 
-#. Button in dialog to quit and discard unsaved document
-#: src/ui.vala:1564
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "保存せずに終了"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/ui.vala:1632
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "ブラザー製スキャナーを見つけました。"
 
 #. Instructions on how to install Brother scanner drivers
-#: src/ui.vala:1634
+#: src/app-window.vala:1331
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"このスキャナーのドライバーは、<a "
-"href=\"http://support.brother.com\">Brotherのウェブサイト</a>から入手できます。"
+"このスキャナーのドライバーは、<a href=\"http://support.brother.com\">Brother"
+"のウェブサイト</a>から入手できます。"
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/ui.vala:1638
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Samsung製スキャナーを見つけました。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/ui.vala:1640
+#: src/app-window.vala:1337
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"このスキャナーのドライバーは、<a href=\"http://samsung.com/support\">Samsungのウェブサイト</a> "
-"から入手できます。"
+"このスキャナーのドライバーは、<a href=\"http://samsung.com/support\">Samsung"
+"のウェブサイト</a> から入手できます。"
 
 #. Message to indicate a HP scanner has been detected
-#: src/ui.vala:1644
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "HP製スキャナーを見つけました。"
 
 #. Message to indicate an Epson scanner has been detected
-#: src/ui.vala:1649
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "エプソン製スキャナーを見つけました。"
 
 #. Instructions on how to install Epson scanner drivers
-#: src/ui.vala:1651
+#: src/app-window.vala:1348
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"このスキャナーのドライバーは、<a href=\"http://support.epson.com\">Epsonウェブサイト</a>から入手できます。"
+"このスキャナーのドライバーは、<a href=\"http://support.epson.com\">Epsonの"
+"ウェブサイト</a>から入手できます。"
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/ui.vala:1655
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "ドライバーのインストール手順"
 
 #. Message in driver install dialog
-#: src/ui.vala:1686
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "ドライバーのインストール後、シンプル スキャンを再起動する必要があります。"
+msgstr ""
+"ドライバーのインストール後、シンプルスキャンを再起動する必要があります。"
 
 #. Label shown while installing drivers
-#: src/ui.vala:1698
-msgid "Installing drivers..."
-msgstr "ドライバーをインストールしています..."
+#: src/app-window.vala:1398
+msgid "Installing drivers…"
+msgstr "ドライバーをインストールしています…"
 
 #. Label shown once drivers successfully installed
-#: src/ui.vala:1706
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "ドライバーのインストールに成功しました!"
 
 #. Label shown if failed to install drivers
-#: src/ui.vala:1716
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "ドライバーのインストールに失敗しました(エラーコード %d)。"
+msgstr "ドライバーのインストールに失敗しました (エラーコード %d)。"
 
 #. Label shown if failed to install drivers
-#: src/ui.vala:1722
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "ドライバーのインストールに失敗しました。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/ui.vala:1729
+#: src/app-window.vala:1429
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "%sパッケージをインストールする必要があります。"
+
+#: src/app-window.vala:1533
+msgid "Email"
+msgstr "メール"
+
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "ページを再整列"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
+msgid "Preferences"
+msgstr "設定"
+
+#: src/app-window.vala:1538
+msgid "Keyboard Shortcuts"
+msgstr "キーボードショートカット"
+
+#: src/app-window.vala:1539
+msgid "Help"
+msgstr "ヘルプ"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1548
+msgid "Start Again…"
+msgstr "再開…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1567
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "ページを左回転 (反時計回り)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1576
+msgid "Rotate the page to the right (clockwise)"
+msgstr "ページを右回転 (時計回り)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1588
+msgid "Crop the selected page"
+msgstr "選択した範囲の切り抜き"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1606
+msgid "Delete the selected page"
+msgstr "選択したページを削除"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1750
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:22
+msgid "_Authorize"
+msgstr "認証(_A)"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:80
+msgid "_Username for resource:"
+msgstr "リソースに対するユーザ名(_U):"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:92
+msgid "_Password:"
+msgstr "パスワード(_P):"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "%s パッケージをインストールする必要があります。"
+msgid "Unable to encode page %i"
+msgstr "%iをエンコードできません"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "スキャン"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "一枚のページをスキャンする"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "ドキュメントフィーダーからすべてのページをスキャンする"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "フラットベッドスキャナーから連続でスキャンする"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "作業中のスキャンを停止する"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "ドキュメントの変更"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "ページを左に移動する"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "ページを右に移動する"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "ページを左に回転する (反時計回り)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "ページを右に回転する (時計回り)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "ページを削除する"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "ドキュメント管理"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "新しいドキュメントをスキャンする"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "スキャンしたドキュメントを保存する"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "スキャンしたドキュメントをメールで送る"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "スキャンしたドキュメントを印刷する"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "現在のページをクリップボードにコピーする"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:80
+msgid "_Scanner"
+msgstr "スキャナー(_S)"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:108
+msgid "Scan Sides"
+msgstr "スキャン面"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:124
+msgid "Page Size"
+msgstr "ページサイズ"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:153
+msgid "Front"
+msgstr "表面"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:163
+msgid "Back"
+msgstr "裏面"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:173
+msgid "Both"
+msgstr "両面"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:200
+msgid "Delay"
+msgstr "遅延"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:215
+msgid "Multiple pages from flatbed"
+msgstr "フラットベッドから複数のページ"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:233
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:243
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:254
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:265
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:276
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:297
+msgid "Seconds"
+msgstr "秒"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:319
+msgid "Scanning"
+msgstr "スキャン"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:339
+msgid "_Text Resolution"
+msgstr "テキストの解像度(_T)"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:354
+msgid "_Photo Resolution"
+msgstr "写真の解像度(_P)"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:398
+msgid "Brightness"
+msgstr "明るさ"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:413
+msgid "Contrast"
+msgstr "コントラスト"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:461
+msgid "Quality"
+msgstr "品質"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:72
+msgid "Automatic"
+msgstr "自動"
+
+#: src/preferences-dialog.vala:113
+msgid "Darker"
+msgstr "暗く"
+
+#: src/preferences-dialog.vala:115
+msgid "Lighter"
+msgstr "明るく"
+
+#: src/preferences-dialog.vala:123
+msgid "Less"
+msgstr "弱く"
+
+#: src/preferences-dialog.vala:125
+msgid "More"
+msgstr "強く"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/ui.vala:1833
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (標準)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/ui.vala:1836
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ドラフト)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/ui.vala:1839
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解像度)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/ui.vala:1842
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: src/ui.vala:1885
-msgid "New Document"
-msgstr "新しいドキュメント"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "利用可能なスキャナーがありません。スキャナーを接続してください。"
 
-#: src/ui.vala:1890
-msgid "Document"
-msgstr "ドキュメント"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "スキャナーに接続できません"
 
-#: src/ui.vala:1893
-msgid "Email..."
-msgstr "メール..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1251
+msgid "Unable to start scan"
+msgstr "スキャンを開始できません"
 
-#: src/ui.vala:1894
-msgid "Print..."
-msgstr "印刷..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1264 src/scanner.vala:1371
+msgid "Error communicating with scanner"
+msgstr "スキャナーとの通信に失敗しました"
 
-#: src/ui.vala:1902
-msgid "Help"
-msgstr "ヘルプ"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "リリースバージョンを表示"
 
-#: src/ui.vala:1903
-msgid "About"
-msgstr "このプログラムについて"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "デバッグメッセージを表示"
 
-#: src/ui.vala:1904
-msgid "Quit"
-msgstr "終了"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"古いバージョンのシンプルスキャンによって生成されたPDFファイルを修復する"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: src/ui.vala:1937
-msgid "Change _Scanner"
-msgstr "スキャナを変更(_S)"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:393
+msgid "Failed to scan"
+msgstr "スキャンに失敗しました"
 
-#. Button in error infobar to prompt user to install drivers
-#: src/ui.vala:1939
-msgid "_Install Drivers"
-msgstr "ドライバーをインストール (_I)"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:408
+msgid "Scan in progress"
+msgstr "スキャン実行中"
 
-#. Combo box value for automatic paper size
-#: src/ui.vala:1945
-msgid "Automatic"
-msgstr "自動"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:585
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[デバイス…] — スキャンユーティリティ"
 
-#: src/ui.vala:1995
-msgid "Darker"
-msgstr "暗く"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:596
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"“%s --help”を実行すると利用可能なすべてのコマンドラインオプションの一覧が表示"
+"されます。"
 
-#: src/ui.vala:1997
-msgid "Lighter"
-msgstr "明るく"
+#~ msgid "Photo"
+#~ msgstr "写真"
 
-#: src/ui.vala:2005
-msgid "Less"
-msgstr "弱く"
+#~ msgid "_Document"
+#~ msgstr "ドキュメント(_D)"
 
-#: src/ui.vala:2007
-msgid "More"
-msgstr "強く"
+#~ msgid "Sc_an"
+#~ msgstr "スキャン(_A)"
 
-#: src/ui.vala:2015
-msgid "Minimum"
-msgstr "最小"
+#~ msgid "_Stop Scan"
+#~ msgstr "スキャン停止(_S)"
 
-#: src/ui.vala:2017
-msgid "Maximum"
-msgstr "最大"
+#~ msgid "_Email"
+#~ msgstr "電子メール(_E)"
 
-#: src/ui.vala:2068
-msgid "Saving document..."
-msgstr "ドキュメントを保存しています..."
+#~ msgid "_Page"
+#~ msgstr "ページ(_P)"
 
-#: src/ui.vala:2242
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "%2$dページ中%1$dページを保存しています"
+#~ msgid "_Help"
+#~ msgstr "ヘルプ(_H)"
+
+#~ msgid "_Contents"
+#~ msgstr "コンテンツ(_C)"
+
+#~ msgid "Save"
+#~ msgstr "保存"
+
+#~ msgid "About"
+#~ msgstr "このプログラムについて"
+
+#~ msgid "Front and Back"
+#~ msgstr "表面と裏面"
+
+#~ msgid "New"
+#~ msgstr "新規"
+
+#~ msgid "Rotate Left"
+#~ msgstr "左へ回転"
+
+#~ msgid "Rotate Right"
+#~ msgstr "右へ回転"
+
+#~ msgid "Crop"
+#~ msgstr "切り抜き"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "スキャンする対象(_O):"
+
+#~ msgid "New Document"
+#~ msgstr "新しいドキュメント"
+
+#~ msgid "Document"
+#~ msgstr "ドキュメント"
+
+#~ msgid "Email..."
+#~ msgstr "メール..."
+
+#~ msgid "Print..."
+#~ msgstr "印刷..."
+
+#~ msgid "Quit"
+#~ msgstr "終了"
+
+#~ msgid "_Install Drivers"
+#~ msgstr "ドライバーをインストール (_I)"
+
+#~ msgid "Minimum"
+#~ msgstr "最小"
+
+#~ msgid "Maximum"
+#~ msgstr "最大"
+
+#~ msgid "Saving document..."
+#~ msgstr "ドキュメントを保存しています..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "%2$dページ中%1$dページを保存しています"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -788,7 +1075,6 @@ msgstr "%2$dページ中%1$dページを保存しています"
 #~ msgid "Please check your installation"
 #~ msgstr "インストールされているか確認してください"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -805,54 +1091,26 @@ msgstr "%2$dページ中%1$dページを保存しています"
 #~ msgid "Select File _Type"
 #~ msgstr "ファイルタイプの選択(_T)"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "スキャンするドキュメントの種類"
-
-#~ msgid "Page side to scan"
-#~ msgstr "スキャンする面"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "ファイルを保存するディレクトリ"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "10mm単位の用紙の高さ"
-
-#~ msgid "Device to scan from"
-#~ msgstr "スキャンするデバイス"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr "スキャンする面のことです。次のうちから 1 つ選択できます: '両面' '表面' '裏面'"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
+#~ msgstr ""
+#~ "スキャンする面のことです。次のうちから 1 つ選択できます: '両面' '表面' '裏"
+#~ "面'"
 
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
-#~ msgstr "ピクセル単位のスキャンされたイメージの高さです。この値は最後にスキャンしたページのものに更新されます。"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "10mm単位の紙の高さ (または 0 で自動紙検知)"
+#~ msgstr ""
+#~ "ピクセル単位のスキャンされたイメージの高さです。この値は最後にスキャンした"
+#~ "ページのものに更新されます。"
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "アプリケーションのウィンドウを最大化するには TRUE にします"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "画像を取得する SANE デバイスです。"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "テキストスキャンの解像度"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "写真スキャンの解像度"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "最後にスキャンした画像の解像度"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr "ファイルを保存するディレクトリです。設定されていない場合、標準でドキュメントディレクトリに保存されます。"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "ウィンドウの高さ(ピクセル)"
 
@@ -862,51 +1120,8 @@ msgstr "%2$dページ中%1$dページを保存しています"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "前にスキャンした画像の解像度(DPI)です。"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "テキストをスキャンするときの解像度(DPI)です。"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "写真をスキャンするときの解像度(DPI)です。"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "10mm単位での紙の幅"
-
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "スキャン画像の幅(ピクセル)"
 
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "10mm単位の用紙の幅 (または自動用紙検知の場合は 0)"
-
-#~ msgid "The page side to scan."
-#~ msgstr "スキャンされる面"
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "スキャナの走査方向"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr "スキャンされる文書の種類。この設定により、画像の解像度、色の深度、事後処理が決定されます。"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "-100から100までの範囲でコントラストを調節する (0は無調整)。"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "スキャンのコントラスト"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "-100から100までの範囲で明るさを調節する (0は無調整)。"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "スキャンの明るさ"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "JPEGの圧縮に使用する品質の値です。"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "JPEGの圧縮に使用する品質の値"
-
-#~ msgid "Scanned Document"
-#~ msgstr "スキャン済みドキュメント"
diff --git a/po/kk.po b/po/kk.po
index f7db766..9bd7d53 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-08-21 13:59+0500\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-16 18:49+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "Language: kk\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -127,7 +127,7 @@ msgstr "Беттер арасындағы кідіріс уақыты, милл�
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr ""
 
@@ -161,357 +161,308 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Мәтін"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Фото"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "Құ_жат"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Ск_анерлеу"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "Сканерлеуді _тоқтату"
-
-#. 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 ""
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr ""
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr ""
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "_Солға бұру"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "_Оңға бұру"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "Қ_иып жіберу"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Ешнәрсе"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "Таң_дауыңызша"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Солға жылжыту"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Оңға жылжыту"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Көмек"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "Құра_масы"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Тоқтау"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
 msgstr ""
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Іздеу"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr ""
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Құжатты файлға сақтау"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Сақтау"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr ""
+
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr ""
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
 msgstr ""
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Тоқтау"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Мәтін"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
+#: src/app-window.ui:529
+msgid "_Image"
 msgstr ""
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Жабу"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr ""
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr ""
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Сканерлер табылмады"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Қалайша сақтау…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Бас тарту"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Сақтау"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Бас тарту"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Сканерленген құжат.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Сурет файлдары"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (көпбетті құжат)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (сығылған)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (жоғалтусыз)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (сығылған)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Файл пішімі:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Сығу:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "\"%s\" деп аталатын файл бар болып тұр. Оны алмастыруды қалайсыз ба?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "А_лмастыру"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Сақталуда"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Файлды сақтау сәтсіз аяқталды"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Сақтамасаңыз, өзгерістер қайтпастай жоғалады."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Ағымдағы құжатты сақтау керек пе?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -528,16 +479,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
@@ -546,159 +497,160 @@ msgstr ""
 "  jmb_kz https://launchpad.net/~jmb-kz"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Сақтамай-ақ шығу"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Драйверлерді орнату"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Драйверлерді орнату…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Драйверлер сәтті орнатылды!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] ""
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "Эл. пошта"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr ""
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Баптаулары"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Көмек"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Осы туралы"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Қайтадан бастау…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr ""
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr ""
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Бас тарту"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Құпия сөз:"
 
@@ -793,146 +745,146 @@ msgid "Copy current page to clipboard"
 msgstr ""
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Сканер"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr ""
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Бет өлшемі"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Бет жағы"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Сырты"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Екеуі де"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Кідіріс"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr ""
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Секунд"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Сканерлеу"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
-msgstr ""
+msgstr "_Мәтін ажыратылымдығы"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Фото ажыратылымдығы"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Жарықтылығы"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Контраст"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Сапасы"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Авто"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Қүңгірттеу"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Ашықтау"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Азырақ"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Көбірек"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr ""
@@ -948,12 +900,12 @@ msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -965,34 +917,58 @@ msgstr "Нұсқа ақпаратын көрсету"
 #. Help string for command line --debug flag
 #: src/simple-scan.vala:24
 msgid "Print debugging messages"
-msgstr ""
+msgstr "Жөндеу хабарламаларын шығару"
 
 #: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr ""
+msgstr "Simple Scan ескі нұсқаларымен жасалған PDF файлдарын жөндеу"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Сканерлеу сәтсіз аяқталды"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Сканерлеу жүріп жатыр"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[ҚҰРЫЛҒЫ…] — Сканерлеу утилитасы"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Командалық жолдың барлық опцияларын қарау үшін \"%s --help\" енгізіңіз."
 
+#~ msgid "Photo"
+#~ msgstr "Фото"
+
+#~ msgid "_Document"
+#~ msgstr "Құ_жат"
+
+#~ msgid "Sc_an"
+#~ msgstr "Ск_анерлеу"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "Сканерлеуді _тоқтату"
+
+#~ msgid "_Help"
+#~ msgstr "_Көмек"
+
+#~ msgid "_Contents"
+#~ msgstr "Құра_масы"
+
+#~ msgid "Save"
+#~ msgstr "Сақтау"
+
+#~ msgid "About"
+#~ msgstr "Осы туралы"
+
 #~ msgid "Quit"
 #~ msgstr "Шығу"
 
diff --git a/po/ko.po b/po/ko.po
index 726785b..a45d404 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,22 +2,22 @@
 # Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
-# DaeHyun Sung <sungdh86@gmail.com>, 2018.
+# DaeHyun Sung <sungdh86@gmail.com>, 2018-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-02-20 23:24+0000\n"
-"PO-Revision-Date: 2018-02-25 16:35+0900\n"
-"Last-Translator: DaeHyun Sung <sungdh86@gmail.com>\n"
-"Language-Team: Korean <gnome-kr@googlegroups.com>\n"
+"POT-Creation-Date: 2019-02-22 07:57+0000\n"
+"PO-Revision-Date: 2019-02-23 17:25+0900\n"
+"Last-Translator: DaeHyun Sung <sungdh86+git@gmail.com>\n"
+"Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -133,7 +133,7 @@ msgstr "페이지 갼 지연 시간 (밀리초)."
 #. 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:1560
+#: src/app-window.ui:181 src/app-window.vala:1266 src/app-window.vala:1520
 msgid "Simple Scan"
 msgstr "심플 스캔"
 
@@ -173,353 +173,310 @@ msgstr "scan;스캔;scanner;스캐너;flatbed;평판 스캐너;adf;자동급지�
 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:820
-msgid "Single _Page"
-msgstr "단일 페이지(_P)"
-
-#. 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:829
-msgid "All Pages From _Feeder"
-msgstr "스케너의 모든 페이지(_F)"
-
-#. 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:838
-msgid "_Multiple Pages From Flatbed"
-msgstr "평판스캐너에서 여러 장 스캔(_M)"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
-msgid "Text"
-msgstr "텍스트"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
-msgid "Photo"
-msgstr "사진"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "문서(_D)"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "스캔(_A)"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "스캔 중지(_S)"
-
-#. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
-msgid "Reorder Pages"
-msgstr "페이지 다시 정렬"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "전자메일(_E)"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "페이지(_P)"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "왼쪽으로 돌리기(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "오른쪽으로 돌리기(_R)"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "잘라내기(_C)"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "없음(_N)"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "편지(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "미국 법정 규격(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
+#. Radio button for cropping page to A3
+#: src/app-window.ui:106
+msgid "A_3"
+msgstr "A_3"
+
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:397
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "사용자 설정(_C)"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:415
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "잘라낸 영역 회전(_R)"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:428
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "왼쪽으로 이동"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:437
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "오른쪽으로 이동"
 
-#. Label on help menu
-#: src/app-window.ui:474
-msgid "_Help"
-msgstr "도움말(_H)"
-
-#. Help|Contents menu
-#: src/app-window.ui:482
-msgid "_Contents"
-msgstr "내용(_C)"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "정지"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:520 src/app-window.ui:720
-msgid "Scan a single page from the scanner"
-msgstr "스캐너로부터 한 페이지 스캔"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "현재 스캔 중지"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:522 src/app-window.ui:716
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "스캔"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "스캐너로부터 한 페이지 스캔"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:538 src/app-window.ui:787
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "파일로 문서 저장하기"
 
-#: src/app-window.ui:540
-msgid "Save"
-msgstr "저장"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "단일 페이지(_S)"
 
-#. Tooltip for stop button
-#: src/app-window.ui:555 src/app-window.ui:700
-msgid "Stop the current scan"
-msgstr "현재 스캔 중지"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "스케너의 모든 페이지(_F)"
 
-#: src/app-window.ui:556 src/app-window.ui:697
-msgid "Stop"
-msgstr "정지"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "평판스캐너에서 여러 장 스캔(_M)"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:611
-msgid "Searching for Scanners…"
-msgstr "스캐너 검색 중…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "텍스트(_T)"
+
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "이미지(_I)"
 
-#: src/app-window.vala:237 src/app-window.vala:1380
+#: src/app-window.vala:221 src/app-window.vala:1353
 msgid "_Close"
 msgstr "닫기(_C)"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:246
+#: src/app-window.vala:230
 #, c-format
 msgid "Username and password required to access “%s”"
-msgstr "'%s'에 접근하려면 사용자 이름과 암호가 필요합니다"
+msgstr "“%s”에 접근하려면 사용자 이름과 암호가 필요합니다"
+
+#. Label shown when searching for scanners
+#: src/app-window.vala:246
+msgid "Searching for Scanners…"
+msgstr "스캐너 검색 중…"
 
 #. Label shown when detected a scanner
-#: src/app-window.vala:266 src/app-window.vala:584
+#: src/app-window.vala:252
 msgid "Ready to Scan"
 msgstr "스캔 준비"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:273
+#: src/app-window.vala:259
 msgid "Additional software needed"
 msgstr "추가 소프트웨어 필요"
 
 #. Instructions to install driver software
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
 msgstr ""
-"링크 <a href=\"install-firmware\">드라이버 프로그램 설치</a> 로 스캐너용 드"
-"라이버를 설치해야 합니다."
+"링크 <a href=\"install-firmware\">드라이버 프로그램 설치</a> 로 스캐너용 드라"
+"이버를 설치해야 합니다."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:281
+#: src/app-window.vala:267
 msgid "No scanners detected"
 msgstr "감지된 스캐너 없음"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "Please check your scanner is connected and powered on"
 msgstr "스캐너와 연결되어있는지, 전원이 켜져 있는지 확인해 주세요"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:298
+#: src/app-window.vala:292
 msgid "Save As…"
 msgstr "다른 이름으로 저장…"
 
-#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
-msgid "_Cancel"
-msgstr "취소(_C)"
-
-#: src/app-window.vala:302 src/app-window.vala:553
+#: src/app-window.vala:295 src/app-window.vala:549
 msgid "_Save"
 msgstr "저장(_S)"
 
+#: src/app-window.vala:296 src/app-window.vala:464 src/app-window.vala:548
+msgid "_Cancel"
+msgstr "취소(_C)"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:310
+#: src/app-window.vala:303
 msgid "Scanned Document.pdf"
 msgstr "스캔한 문서.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:316
+#: src/app-window.vala:309
 msgid "Image Files"
 msgstr "그림 파일"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:326
+#: src/app-window.vala:319
 msgid "All Files"
 msgstr "모든 파일"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:335
+#: src/app-window.vala:328
 msgid "PDF (multi-page document)"
 msgstr "PDF (여러 페이지 문서)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:341
+#: src/app-window.vala:334
 msgid "JPEG (compressed)"
 msgstr "JPEG (압축된)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:347
+#: src/app-window.vala:340
 msgid "PNG (lossless)"
 msgstr "PNG (무손실)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:354
+#: src/app-window.vala:347
 msgid "WebP (compressed)"
 msgstr "WebP (압축된)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:364
+#: src/app-window.vala:357
 msgid "File format:"
 msgstr "파일 형식:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:376
+#: src/app-window.vala:369
 msgid "Compression:"
 msgstr "압축:"
 
 #. 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:470
+#: src/app-window.vala:463
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "이미 “%s”(으)로 된 파일 이름이 존재합니다. 파일을 바꾸겠습니까?"
 
 #. 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:473
+#: src/app-window.vala:466
 msgid "_Replace"
 msgstr "바꾸기(_R)"
 
-#: src/app-window.vala:512
+#: src/app-window.vala:505
 msgid "Saving"
 msgstr "저장중"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:527
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "파일 저장 실패"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:550
+#: src/app-window.vala:546
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "저장하지 않으면 바뀐 내용이 영영 사라집니다."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:591
+#: src/app-window.vala:582
 msgid "Save current document?"
 msgstr "현재 문서를 저장하시겠습니까?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:593
+#: src/app-window.vala:584
 msgid "Discard Changes"
 msgstr "바뀐 내용 버리기"
 
 #. Label shown when scan started
-#: src/app-window.vala:692
+#: src/app-window.vala:717
 msgid "Contacting scanner…"
 msgstr "스캐너 연결 중…"
 
 #. Error message display when unable to save image for preview
 #: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "미리 보기 그림을 저장할 수 없습니다."
+msgstr "미리 보기 이미지를 저장할 수 없습니다"
 
 #. Error message display when unable to preview image
 #: src/app-window.vala:812
 msgid "Unable to open image preview application"
-msgstr "그림 미리보기 프로그램을 열 수 없습니다"
+msgstr "이미지 미리보기 프로그램을 열 수 없습니다"
+
+#. Title of dialog to reorder pages
+#: src/app-window.vala:974
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "페이지 다시 정렬"
 
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:990
+#: src/app-window.vala:997
 msgid "Combine sides"
 msgstr "측면 결합"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1000
+#: src/app-window.vala:1007
 msgid "Combine sides (reverse)"
 msgstr "측면 결합(역순)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1010
+#: src/app-window.vala:1017
 msgid "Reverse"
 msgstr "역순"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1020
+#: src/app-window.vala:1027
 msgid "Keep unchanged"
 msgstr "바꾸지 않은 상태 유지"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1250
+#: src/app-window.vala:1241
 msgid "Unable to open help file"
 msgstr "도움말 파일을 열 수 없습니다"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1271
+#: src/app-window.vala:1256
 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"
@@ -548,47 +505,49 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1274
+#: src/app-window.vala:1259 src/app-window.vala:1541
 msgid "About Simple Scan"
 msgstr "심플 스캔 소개"
 
 #. Description of program
-#: src/app-window.vala:1277
+#: src/app-window.vala:1262
 msgid "Simple document scanning tool"
 msgstr "간단한 문서 스캐닝 도구"
 
-#: src/app-window.vala:1286
+#: src/app-window.vala:1271
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
-"  Bundo https://launchpad.net/~kang-bundo\n"
-"  Jung-Kyu Park https://launchpad.net/~bagjunggyu\n"
-"  KiJune Yoon https://launchpad.net/~kijune\n"
-"  Kim Boram https://launchpad.net/~boramism\n"
-"  Koongchi https://launchpad.net/~kama8644-g\n"
-"  Lyuso https://launchpad.net/~lutinaroa\n"
-"  Min-Soo Kim https://launchpad.net/~misol\n"
-"  Seung Soo, Ha https://launchpad.net/~sungsuha-deactivatedaccount\n"
-"  Sunil https://launchpad.net/~sodoetha\n"
-"  atto https://launchpad.net/~kpsman"
+"그놈 기여자:\n"
+" DaeHyun Sung https://gitlab.gnome.org/studioego\n"
+"런치패드 기여자:\n"
+" Bundo https://launchpad.net/~kang-bundo\n"
+" Jung-Kyu Park https://launchpad.net/~bagjunggyu\n"
+" KiJune Yoon https://launchpad.net/~kijune\n"
+" Kim Boram https://launchpad.net/~boramism\n"
+" Koongchi https://launchpad.net/~kama8644-g\n"
+" Lyuso https://launchpad.net/~lutinaroa\n"
+" Min-Soo Kim https://launchpad.net/~misol\n"
+" Seung Soo, Ha https://launchpad.net/~sungsuha-deactivatedaccount\n"
+" Sunil https://launchpad.net/~sodoetha\n"
+" atto https://launchpad.net/~kpsman"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1308
+#: src/app-window.vala:1287
 msgid "Save document before quitting?"
 msgstr "종료하기 전에 문서를 저장하시겠습니까?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1310
+#: src/app-window.vala:1289
 msgid "Quit without Saving"
 msgstr "저장하지 않고 종료"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1357
+#: src/app-window.vala:1330
 msgid "You appear to have a Brother scanner."
 msgstr "브라더 스캐너를 가지고 계신 것 같습니다."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1359
+#: src/app-window.vala:1332
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -597,12 +556,12 @@ msgstr ""
 "website</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1363
+#: src/app-window.vala:1336
 msgid "You appear to have a Samsung scanner."
 msgstr "삼성 스캐너를 가지고 계신 것 같습니다."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1365
+#: src/app-window.vala:1338
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -611,17 +570,17 @@ msgstr ""
 "website</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1369
+#: src/app-window.vala:1342
 msgid "You appear to have an HP scanner."
 msgstr "HP 스캐너를 가지고 계신 것 같습니다."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1347
 msgid "You appear to have an Epson scanner."
 msgstr "Epson 스캐너를 가지고 계신 것 같습니다."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1349
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -630,120 +589,116 @@ msgstr ""
 "website</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1380
+#: src/app-window.vala:1353
 msgid "Install drivers"
 msgstr "드라이버 설치"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1411
+#: src/app-window.vala:1386
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "드라이버 설치 후엔 심플 스캔을 다시 시작해야 합니다."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1423
+#: src/app-window.vala:1399
 msgid "Installing drivers…"
 msgstr "드라이버를 설치하고 있습니다…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1431
+#: src/app-window.vala:1407
 msgid "Drivers installed successfully!"
 msgstr "드라이버를 설치했습니다!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1441
+#: src/app-window.vala:1417
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "드라이버 설치 실패 (에러 코드 %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1447
+#: src/app-window.vala:1423
 msgid "Failed to install drivers."
 msgstr "드라이버 설치에 실패했습니다."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1454
+#: src/app-window.vala:1430
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "%s 패키지를 꼭 설치해야 합니다."
 
+#: src/app-window.vala:1534
+msgid "Email"
+msgstr "전자메일"
+
+#: src/app-window.vala:1535
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "페이지 다시 정렬"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1568 src/app-window.vala:1591
-#: src/preferences-dialog.ui:53
+#: src/app-window.vala:1538 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: src/app-window.vala:1572
+#: src/app-window.vala:1539
 msgid "Keyboard Shortcuts"
 msgstr "키보드 바로 가기"
 
-#: src/app-window.vala:1573
+#: src/app-window.vala:1540
 msgid "Help"
 msgstr "도움말"
 
-#: src/app-window.vala:1574
-msgid "About"
-msgstr "정보"
-
-#: src/app-window.vala:1575
-msgid "Quit"
-msgstr "끝내기"
-
-#: src/app-window.vala:1589
-msgid "Email"
-msgstr "전자메일"
-
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1599
+#: src/app-window.vala:1549
 msgid "Start Again…"
 msgstr "다시 시작…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1616
+#: src/app-window.vala:1568
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "페이지를 왼쪽으로 회전 (시계 반대 방향)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1623
+#: src/app-window.vala:1577
 msgid "Rotate the page to the right (clockwise)"
 msgstr "페이지를 오른쪽으로 회전 (시계 방향)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1633
+#: src/app-window.vala:1589
 msgid "Crop the selected page"
 msgstr "선택한 페이지 자르기"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1649
+#: src/app-window.vala:1607
 msgid "Delete the selected page"
 msgstr "선택한 페이지 삭제"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1814
+#: src/app-window.vala:1751
 msgid "Cancel"
 msgstr "취소"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "인증(_A)"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "리소스에 대한 사용자 이름(_U):"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "암호(_P):"
 
 #: src/book.vala:331 src/book.vala:337
 #, c-format
 msgid "Unable to encode page %i"
-msgstr "%i 페이지를 인코딩할 수 없습니다."
+msgstr "%i 페이지를 인코딩할 수 없습니다"
 
 #: src/help-overlay.ui:12
 msgctxt "shortcut window"
@@ -831,146 +786,146 @@ msgid "Copy current page to clipboard"
 msgstr "현재 페이지를 클립보드로 복사"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "스캐너(_S)"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "가장자리 스캔"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "페이지 크기"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "앞면"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "뒷면"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "양면"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "지연"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "평판스캐너로 여러 페이지를 스캔"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "초"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "스캔"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "텍스트 해상도(_T)"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "사진 해상도(_P)"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "밝기"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "명암"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "품질"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "자동 설정"
 
-#: src/preferences-dialog.vala:116
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "어둡게"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "밝게"
 
-#: src/preferences-dialog.vala:126
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "적게"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "많이"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:440
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (기본값)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:443
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (초안)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:446
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (고해상도)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:449
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -986,12 +941,12 @@ msgid "Unable to connect to scanner"
 msgstr "스캐너에 연결할 수 없음"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "스캔을 시작할 수 없음"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1340
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "스캐너와의 통신 에러"
 
@@ -1010,25 +965,58 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "이전 버전의 심플 스캔으로 만든 PDF 파일 고치기"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "스캔 실패"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "스캔 진행 중"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[장치...] - 스캔 도구"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
-msgstr "사용 가능한 모든 선택의 목록을 보려면 '%s --help' 명령을 실행하십시오."
+msgstr "사용 가능한 모든 선택의 목록을 보려면 “%s --help” 명령을 실행하십시오."
+
+#~ msgid "Photo"
+#~ msgstr "사진"
+
+#~ msgid "_Document"
+#~ msgstr "문서(_D)"
+
+#~ msgid "Sc_an"
+#~ msgstr "스캔(_A)"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "스캔 중지(_S)"
+
+#~ msgid "_Email"
+#~ msgstr "전자메일(_E)"
+
+#~ msgid "_Page"
+#~ msgstr "페이지(_P)"
+
+#~ msgid "_Help"
+#~ msgstr "도움말(_H)"
+
+#~ msgid "_Contents"
+#~ msgstr "내용(_C)"
+
+#~ msgid "About"
+#~ msgstr "정보"
+
+#~ msgid "Save"
+#~ msgstr "저장"
+
+#~ msgid "Quit"
+#~ msgstr "끝내기"
 
 #~ msgid "Front and Back"
 #~ msgstr "앞뒤"
diff --git a/po/lt.po b/po/lt.po
index 7e1f817..7a72485 100644
--- a/po/lt.po
+++ b/po/lt.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.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-# Aurimas Černius <aurisc4@gmail.com>, 2017, 2018.
+# Aurimas Černius <aurisc4@gmail.com>, 2017-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-08-05 15:50+0300\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-09 17:40+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -137,7 +137,7 @@ msgstr "Delsa tarp puslapių milisekundėmis."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Paprastas skenavimas"
 
@@ -177,207 +177,154 @@ msgstr "skenuoti;nuskaityti;adf;skaitytuvas;skeneris;plokštuminis;"
 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 "Vieną  _puslapį"
-
-#. 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 "Visus puslapius iš _padaviklio"
-
-#. 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 "_Daug puslapių nuo skenavimo plokštumos"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Tekstas"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Nuotrauka"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Dokumentas"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "S_kenuoti"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Stabdyti skenavimą"
-
-#. 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 "Pakeisti puslapių tvarką"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_Siųsti el. paštu"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Puslapis"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Pasukti _kairėn"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Pasukti _dešinėn"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Apkirpti"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Nėra"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Laiškas"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Tei_sinis"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Pasirinktinis"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Pasukti apkirpimą"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Perkelti kairėn"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Perkelti dešinėn"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Žinynas"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Turinys"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Stabdyti"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Skenuoti vieną puslapį iš skenerio."
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Stabdyti esamą skenavimą"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Skenuoti"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Skenuoti vieną puslapį iš skenerio."
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Įrašyti dokumentą į failą"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Įrašyti"
+#: src/app-window.ui:405
+#| msgid "Single _Page"
+msgid "_Single Page"
+msgstr "Vieną  _puslapį"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Stabdyti esamą skenavimą"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Visus puslapius iš _padaviklio"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Stabdyti"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Daug puslapių nuo skenavimo plokštumos"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Ieškoma skenerių"
+#: src/app-window.ui:498
+#| msgid "Text"
+msgid "_Text"
+msgstr "_Tekstas"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Paveikslėlis"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Užverti"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Naudotojo vardas ir slaptažodis, reikalingas prieigai prie „%s“"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Ieškoma skenerių"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Pasiruošta skenavimui"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Reikalinga papildoma programinė įranga"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -385,150 +332,157 @@ msgstr ""
 "Jūs turite savo skeneriui <a href=\"install-firmware\">įdiegti tvarkyklę</a>."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Skenerių neaptikta"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Patikrinkite ar skeneris yra prijungtas ir įjungtas"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Įrašyti taip…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Atsisakyti"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "Į_rašyti"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Nuskenuotas dokumentas.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Paveikslų failai"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Visi failai"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (kelių puslapių dokumentas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (suglaudintas)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (nenuostolingasis)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (suglaudintas)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Failo formatas:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Suspaudimas:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Failas pavadinimu „%s“ jau yra.  Ar norite jį perrašyti?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "Per_rašyti"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Įrašoma"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Nepavyko įrašyti failo"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Jeigu neįrašysite, pakeitimai bus negrįžtamai prarasti."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Įrašyti šį dokumentą?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Atmesti pakeitimus"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Jungiamasi prie _skenerio…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Nepavyko įrašyti paveikslo peržiūrai"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Nepavyko atverti paveikslų peržiūros programos"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+#| msgid "Reorder Pages"
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Pakeisti puslapių tvarką"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Suskirstyti puses"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Suskirstyti puses (atvirkščiai)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Atvirkščiai"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Palikti nepakeistus"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Nepavyko atverti žinyno failo"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -558,16 +512,16 @@ msgstr ""
 "šia programa; jei negavote, žiūrėkite <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Apie Paprastą skenavimą"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Paprastas dokumentų skenavimo įrankis"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -581,22 +535,22 @@ msgstr ""
 "  romasg https://launchpad.net/~romasg"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Įrašyti dokumentą prieš baigiant programos darbą?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Baigti neįrašant"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Atrodo, kad turite Brother skenerį."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -605,12 +559,12 @@ msgstr ""
 "com\">Brother svetainėje</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Atrodo, kad turite Samsung skenerį."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -619,17 +573,17 @@ msgstr ""
 "support\">Samsung svetainėje</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Atrodo, kad turite HP skenerį."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Atrodo, kad turite Epson skenerį."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -638,38 +592,38 @@ msgstr ""
 "\">Epson svetainėje</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Įdiegti tvarkykles"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Įdiegę, turėsite iš naujo paleisti Paprastą skenavimą."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Įdiegiamos tvarkyklės…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Tvarkyklės sėkmingai įdiegtos!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Nepavyko įdiegti tvarkyklių (klaidos kodas %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Nepavyko įdiegti tvarkyklių."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -677,71 +631,73 @@ msgstr[0] "Jums reikia įdiegti %s paketą."
 msgstr[1] "Jums reikia įdiegti %s paketus."
 msgstr[2] "Jums reikia įdiegti %s paketus."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "El. paštu"
 
+#: src/app-window.vala:1534
+#| msgid "Reorder Pages"
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Pakeisti puslapių tvarką"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Nuostatos"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Klaviatūros trumpiniai"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Žinynas"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Apie"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Pradėti iš naujo…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Pasukti puslapį kairėn (prieš laikrodžio rodyklę)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pasukti puslapį dešinėn (pagal laikrodžio rodyklę)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Apkirpti pažymėtą puslapį"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Ištrinti pasirinktą puslapį"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Atsisakyti"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "Į_galioti"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Ištekliaus na_udotojo vardas:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "Sla_ptažodis:"
 
@@ -836,146 +792,146 @@ msgid "Copy current page to clipboard"
 msgstr "Kopijuoti nuskenuotą dokumentą į iškarpinę"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Skeneris"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Skenuoti puses"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Puslapio dydis"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Priekinė pusė"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Galinė pusė"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Abi"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Delsa"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Daug puslapių nuo plokštumos"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Sekundžių"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Skenuojama"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Teksto raiška"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Nuotraukos raiška"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Šviesumas"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrastas"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kokybė"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Tamsesnis"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Šviesesnis"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Mažiau"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Daugiau"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d tašk./col. (numatytoji)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d tašk./col. (juodraštis)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d tašk./col. (didelė raiška)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d tašk./col."
@@ -991,12 +947,12 @@ msgid "Unable to connect to scanner"
 msgstr "Nepavyko prisijungti prie skenerio"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Nepavyko pradėti skenavimo"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Klaida susisiekiant su skeneriu"
 
@@ -1016,27 +972,57 @@ msgstr ""
 "Pataisyti PDF failus sukurtus su senesnėmis „Paprasto skenavimo“ versijomis"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Skenavimas nepavyko"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Vykdomas skenavimas"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[ĮRENGINYS...] - Skenavimo įraknis"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Norėdami pamatyti komandų eilutės parametrų sąrašą, paleiskite „%s --help“."
 
+#~ msgid "Photo"
+#~ msgstr "Nuotrauka"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokumentas"
+
+#~ msgid "Sc_an"
+#~ msgstr "S_kenuoti"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Stabdyti skenavimą"
+
+#~ msgid "_Email"
+#~ msgstr "_Siųsti el. paštu"
+
+#~ msgid "_Page"
+#~ msgstr "_Puslapis"
+
+#~ msgid "_Help"
+#~ msgstr "_Žinynas"
+
+#~ msgid "_Contents"
+#~ msgstr "_Turinys"
+
+#~ msgid "Save"
+#~ msgstr "Įrašyti"
+
+#~ msgid "About"
+#~ msgstr "Apie"
+
 #~ msgid "Quit"
 #~ msgstr "Baigti"
 
diff --git a/po/lv.po b/po/lv.po
index 4bf7e88..759b2bf 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the simple-scan package.
 #
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2017, 2018.
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2017, 2018, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-09-06 21:10+0000\n"
-"PO-Revision-Date: 2018-09-14 15:27+0200\n"
-"Last-Translator: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"POT-Creation-Date: 2019-02-22 07:57+0000\n"
+"PO-Revision-Date: 2019-03-03 13:01+0200\n"
+"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "Language: lv\n"
 "MIME-Version: 1.0\n"
@@ -136,7 +136,7 @@ msgstr "Aizture milisekundēs starp lappusēm."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1266 src/app-window.vala:1520
 msgid "Simple Scan"
 msgstr "Vienkārša skenēšana"
 
@@ -175,207 +175,154 @@ msgstr "skenēt;skeneris;plakanvirsma;adf;"
 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 "Viena la_pa"
-
-#. 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 "Visas lapas no _padeves"
-
-#. 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 "_Vairākas lappuses no plakanvirsmas"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Teksts"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Foto"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Dokuments"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Sk_enēt"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "Apturēt _skenēšanu"
-
-#. 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 "Pārkārtot lapas"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-pasts"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "La_pa"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Pagriezt pa _kreisi"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Pag_riezt pa labi"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Kadrēt"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Bez"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Vēstules forma"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gāls"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Pielāgots"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "Pag_riezt kadrējumu"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Pārvietot pa kreisi"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Pārvietot pa labi"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Palīdzība"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Saturs"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Apturēt"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Ieskenēt vienu lapu no skenera"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Apturēt pašreizējo skenēšanu"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Skenēt"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Ieskenēt vienu lapu no skenera"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Saglabāt dokumentu datnē"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Saglabāt"
+#: src/app-window.ui:405
+#| msgid "Single _Page"
+msgid "_Single Page"
+msgstr "_Viena lapa"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Apturēt pašreizējo skenēšanu"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Visas lapas no _padeves"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Apturēt"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Vairākas lappuses no plakanvirsmas"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Meklē skenerus…"
+#: src/app-window.ui:498
+#| msgid "Text"
+msgid "_Text"
+msgstr "_Teksts"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Attēls"
+
+#: src/app-window.vala:221 src/app-window.vala:1353
 msgid "_Close"
 msgstr "_Aizvērt"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:230
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Lai piekļūtu “%s”, ir vajadzīgs lietotājvārds un parole"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:246
+msgid "Searching for Scanners…"
+msgstr "Meklē skenerus…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:252
 msgid "Ready to Scan"
 msgstr "Gatavs skenēt"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:259
 msgid "Additional software needed"
 msgstr "Nepieciešama papildu programmatūra"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:261
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -383,150 +330,157 @@ msgstr ""
 "Vajadzēs <a href=\"install-firmware\">uzinstalēt draiveri</a> šim skenerim."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:267
 msgid "No scanners detected"
 msgstr "Nav atrasts neviens skeneris"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:269
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lūdzu, pārbaudiet, vai skeneris ir pievienots un ieslēgts"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:292
 msgid "Save As…"
 msgstr "Saglabāt kā…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "At_celt"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:295 src/app-window.vala:549
 msgid "_Save"
 msgstr "_Saglabāt"
 
+#: src/app-window.vala:296 src/app-window.vala:464 src/app-window.vala:548
+msgid "_Cancel"
+msgstr "At_celt"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:303
 msgid "Scanned Document.pdf"
 msgstr "Ieskenēts Dokuments.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:309
 msgid "Image Files"
 msgstr "Attēlu datnes"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:319
 msgid "All Files"
 msgstr "Visas datnes"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:328
 msgid "PDF (multi-page document)"
 msgstr "PDF (vairāku lapu dokuments)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:334
 msgid "JPEG (compressed)"
 msgstr "JPEG (saspiests)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:340
 msgid "PNG (lossless)"
 msgstr "PNG (bez zudumiem)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:347
 msgid "WebP (compressed)"
 msgstr "WebP (saspiests)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:357
 msgid "File format:"
 msgstr "Datnes formāts:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:369
 msgid "Compression:"
 msgstr "Saspiešana:"
 
 #. 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:463
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Datne ar nosaukumu “%s” jau eksistē. Vai jūs vēlaties to aizstāt?"
 
 #. 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:466
 msgid "_Replace"
 msgstr "_Aizstāt"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:505
 msgid "Saving"
 msgstr "Saglabā"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Neizdevās saglabāt datni"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:546
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Ja nesaglabāsiet, izmaiņas neatgriezeniski pazudīs."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:582
 msgid "Save current document?"
 msgstr "Saglabāt šo dokumentu?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:584
 msgid "Discard Changes"
 msgstr "Izmest izmaiņas"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:717
 msgid "Contacting scanner…"
 msgstr "Sazinās ar skeneri…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Nevar saglabāt attēlu priekšskatīšanai"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Neizdevās atvērt attēlu priekšskatīšanas lietotni"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:974
+#| msgid "Reorder Pages"
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Pārkārtot lapas"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:997
 msgid "Combine sides"
 msgstr "Apvienot puses"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1007
 msgid "Combine sides (reverse)"
 msgstr "Apvienot puses (apgriezti)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1017
 msgid "Reverse"
 msgstr "Pagriezt"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1027
 msgid "Keep unchanged"
 msgstr "Paturēt nemainīti"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1241
 msgid "Unable to open help file"
 msgstr "Nevar atvērt palīdzības datni"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1256
 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 +506,16 @@ msgstr ""
 "nesaņēmāt, skatiet <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1259 src/app-window.vala:1541
 msgid "About Simple Scan"
 msgstr "Par Simple Scan"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1262
 msgid "Simple document scanning tool"
 msgstr "Vienkāršs dokumentu skenēšanas rīks"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1271
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -571,22 +525,22 @@ msgstr ""
 "  Rūdolfs Mazurs https://launchpad.net/~rudolfs-mazurs"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1287
 msgid "Save document before quitting?"
 msgstr "Pirms iziešanas saglabāt dokumentu?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1289
 msgid "Quit without Saving"
 msgstr "Iziet nesaglabājot"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1330
 msgid "You appear to have a Brother scanner."
 msgstr "Izskatās, ka jums ir Brother skeneris."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1332
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -595,12 +549,12 @@ msgstr ""
 "tīmekļa vietnē</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1336
 msgid "You appear to have a Samsung scanner."
 msgstr "Izskatās, ka jums ir Samsung skeneris."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1338
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -609,17 +563,17 @@ msgstr ""
 "tīmekļa vietnē</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1342
 msgid "You appear to have an HP scanner."
 msgstr "Izskatās, ka jums ir HP skeneris."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1347
 msgid "You appear to have an Epson scanner."
 msgstr "Izskatās, ka jums ir Epson skeneris."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1349
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -628,38 +582,38 @@ msgstr ""
 "vietnē</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1353
 msgid "Install drivers"
 msgstr "Instalēt draiverus"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1386
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Kad tie ir instalēti, jums vajadzēs pārstartēt “Vienkāršo skenēšanu”."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1399
 msgid "Installing drivers…"
 msgstr "Instalē draiverus…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1407
 msgid "Drivers installed successfully!"
 msgstr "Draiveri ir veiksmīgi uzinstalēti!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1417
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Neizdevās uzinstalēt draiverus (kļūdas kods %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1423
 msgid "Failed to install drivers."
 msgstr "Neizdevās uzinstalēt draiverus."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1430
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -667,71 +621,73 @@ msgstr[0] "Jums jāuzinstalē %s pakotne."
 msgstr[1] "Jums jāuzinstalē %s pakotnes."
 msgstr[2] "Jums jāuzinstalē %s pakotņu."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1534
 msgid "Email"
 msgstr "E-pasts"
 
+#: src/app-window.vala:1535
+#| msgid "Reorder Pages"
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Pārkārtot lapas"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1538 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1539
 msgid "Keyboard Shortcuts"
 msgstr "Tastatūras saīsnes"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1540
 msgid "Help"
 msgstr "Palīdzība"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Par"
-
 #. 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:1549
 msgid "Start Again…"
 msgstr "Startēt atkal…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1568
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Pagriezt lapu pa kreisi (pretēji pulksteņa rādītāja virzienam)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1577
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pagriezt lapu pa labi (pulksteņa rādītāja virzienā)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1589
 msgid "Crop the selected page"
 msgstr "Kadrēt izvēlēto lapu"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1607
 msgid "Delete the selected page"
 msgstr "Dzēst izvēlēto lapu"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1751
 msgid "Cancel"
 msgstr "Atcelt"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Autorizēties"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Res_ursa lietotājvārds:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Parole:"
 
@@ -826,146 +782,146 @@ msgid "Copy current page to clipboard"
 msgstr "Kopēt šo lapu uz starpliktuvi"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Skeneris"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Skenēt puses"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Lapas izmērs"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Priekšpuse"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Aizmugure"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Abas"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Aizture"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Vairākas lappuses no plakanvirsmas"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Sekundes"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Skenēšana"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Teksta izšķirtspēja"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Fotogrāfijas izšķirts_pēja"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Gaišums"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrasts"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kvalitāte"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Tumšāks"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Gaišāks"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Mazāk"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Vairāk"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (noklusējuma)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (melraksts)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (augsta izšķirtspēja)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -981,12 +937,12 @@ msgid "Unable to connect to scanner"
 msgstr "Neizdevās savienoties ar skeneri"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Neizdevās sākt skenēšanu"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Kļūda, sazinoties ar skeneri"
 
@@ -1027,6 +983,36 @@ msgstr ""
 "Palaidiet “%s --help”, lai redzētu pilnu pieejamo komandrindas opciju "
 "sarakstu."
 
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokuments"
+
+#~ msgid "Sc_an"
+#~ msgstr "Sk_enēt"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "Apturēt _skenēšanu"
+
+#~ msgid "_Email"
+#~ msgstr "_E-pasts"
+
+#~ msgid "_Page"
+#~ msgstr "La_pa"
+
+#~ msgid "_Help"
+#~ msgstr "_Palīdzība"
+
+#~ msgid "_Contents"
+#~ msgstr "_Saturs"
+
+#~ msgid "About"
+#~ msgstr "Par"
+
+#~ msgid "Save"
+#~ msgstr "Saglabāt"
+
 #~ msgid "Quit"
 #~ msgstr "Iziet"
 
diff --git a/po/ml.po b/po/ml.po
new file mode 100644
index 0000000..714638a
--- /dev/null
+++ b/po/ml.po
@@ -0,0 +1,1029 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Athul R T <athul111@gmail.com>, 2017.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
+"POT-Creation-Date: 2018-10-26 14:22+0000\n"
+"PO-Revision-Date: 2018-10-23 07:32+0530\n"
+"Last-Translator: Athul R T <athul111@gmail.com>\n"
+"Language-Team: Malayalam <l10n@lists.smc.org.in>\n"
+"Language: ml\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.7.1\n"
+
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "സ്കാൻ ചെയ്യുന്ന ഉപകരണം"
+
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "ചിത്രങ്ങൾ എടുക്കുന്ന SANE ഉപകരണങ്ങൾ."
+
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "സ്കാൻ ചെയ്യുന്ന ഡോക്യുമെന്റ് തരം"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"സ്കാൻ ചെയ്യേണ്ട ഡോക്യുമെന്റ് തരം. സ്കാൻ റെസൊല്യൂഷൻ, നിറം, പോസ്റ്റ് പ്രോസസിങ് എന്നിവ "
+"തീരുമാനിക്കുന്നത്  ഈ ക്രമീകരണമാണ്."
+
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "പേപ്പറിന്റെ വീതി മില്ലീമീറ്ററിന്റെ പത്തിലൊന്ന് കണക്കിൽ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"പേപ്പറിന്റെ വീതി മില്ലീമീറ്ററിന്റെ പത്തിലൊന്ന് കണക്കിൽ (അല്ലെങ്കിൽ തനിയെ പേപ്പർ "
+"തിരിച്ചറിയുന്നതിനു 0 നൽകുക)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "പേപ്പറിന്റെ നീളം മില്ലീമീറ്ററിന്റെ പത്തിലൊന്ന് കണക്കിൽ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"പേപ്പറിന്റെ നീളം മില്ലീമീറ്ററിന്റെ പത്തിലൊന്ന് കണക്കിൽ (അല്ലെങ്കിൽ തനിയെ പേപ്പർ "
+"തിരിച്ചറിയുന്നതിനു 0 നൽകുക)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "സ്കാനിന്റെ തെളിച്ചം"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "തെളിച്ചം -100 മുതൽ 100 വരെ ക്രമീകരിക്കുക (0 നു ഒട്ടുമില്ല)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "സ്കാനിന്റെ കോണ്‍ട്രാസ്റ്റ്"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "കോണ്‍ട്രാസ്റ്റ് -100 മുതൽ 100 വരെ ക്രമീകരിക്കുക (0 നു ഒട്ടുമില്ല)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "ടെക്സ്റ്റ് സ്കാനിന്റെ റെസൊല്യൂഷൻ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "ടെക്സ്റ്റ് സ്കാനിന്റെ റെസൊല്യൂഷൻ ഡോട്‌സ് പെർ ഇഞ്ച് കണക്കിൽ."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "ചിത്രത്തിന്റെ സ്കാൻ റെസൊല്യൂഷൻ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "ചിത്രത്തിന്റെ സ്കാൻ റെസൊല്യൂഷൻ ഡോട്‌സ് പെർ ഇഞ്ച് കണക്കിൽ."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "സ്കാൻ ചെയ്യുന്ന പേജിന്റെ വശം"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "സ്കാൻ ചെയ്യുന്ന പേജിന്റെ വശം."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "ഫയൽ സൂക്ഷിക്കേണ്ട ഫോള്‍ഡര്‍"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "ഫയൽ സൂക്ഷിക്കേണ്ട ഫോള്‍ഡര്‍ തെരഞ്ഞെടുത്തില്ലെങ്കിൽ ഡോക്യുമെന്റ്‌സ് ഫോള്‍ഡറിൽ സൂക്ഷിക്കപ്പെടും."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "ജെപിഇജി ചുരുക്കുന്നതിന്റെ ഗുണമേന്മാ മൂല്യം"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "ജെപിഇജി ചുരുക്കുന്നതിന്റെ ഗുണമേന്മാ മൂല്യം."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "പേജുകൾക്കിടയിലെ മില്ലി സെക്കന്റിന്റെ താമസം"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "പേജുകൾക്കിടയിലെ മില്ലി സെക്കന്റിന്റെ താമസം."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. 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 "സിംപിൾ സ്കാൻ"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "ഡോക്യുമെന്റുകൾ സ്കാൻ ചെയ്യുക"
+
+#: 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 ""
+"ഡോക്യുമെന്റുകളും ചിത്രങ്ങളും സ്കാൻ ചെയ്യാൻ ഒരു എളുപ്പ മാർഗം. നിങ്ങൾക്ക് ചിത്രത്തിന്റെ അനാവശ്യ "
+"വശങ്ങൾ മുറിച്ചുകളയുവാനും അതിനെ കറക്കുവാനും കഴിയും. നിങ്ങൾക്ക് സ്കാൻ പ്രിന്റ് ചെയ്യാനും പിഡിഎഫ് "
+"ആക്കുവാനും പല തരത്തിലുള്ള ഇമേജ് ഫോർമാറ്റിൽ സംരക്ഷിക്കാനും പറ്റും."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr "നിലവിലുള്ള സ്കാനറുകളെ പിന്താങ്ങുന്നതിനായി സിംപിൾ സ്കാൻ SANE ചട്ടക്കൂട് ഉപയോഗിക്കുന്നു."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "ഡോക്യുമെന്റ്‌ സ്കാനർ"
+
+#. 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
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;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
+#, fuzzy
+#| msgid "_Single Page"
+msgid "Single _Page"
+msgstr "ഒറ്റ പേജ് (_page)"
+
+#. 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 "ഫീഡറിൽ നിന്നുള്ള എല്ലാ പേജുകളും (_F)"
+
+#. 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 "ഫ്ലാറ്റ്ബെഡിൽ നിന്നുള്ള പല പേജുകൾ (_M)"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
+#, fuzzy
+#| msgid "_Text"
+msgid "Text"
+msgstr "ടെക്സ്റ്റ് (_Text)"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
+msgid "Photo"
+msgstr "ചിത്രം"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "ഡോക്യൂമെന്റ്‌(_D)"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "സ്കാൻ(_s)"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "സ്കാൻ നിർത്തുക(_stop)"
+
+#. 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 "പേജുകൾ പുനഃക്രമീകരിക്കുക"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "ഈമെയിൽ(_e)"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "പേജ്(_page)"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "ഇടത്തേക്ക് തിരിക്കുക (_left)"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "വലത്തേക്ക് തിരിക്കുക (_right)"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "ക്രോപ്പ് (_crop)"
+
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "ഒന്നുമില്ല (_none)"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr "എ 4 (A_4)"
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr "എ 5 (A_5)"
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr "എ 6 (A_6)"
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+msgid "_Letter"
+msgstr "ലെറ്റർ (_letter)"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+msgid "Le_gal"
+msgstr "ലീഗൽ (le_gal)"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+msgid "4×6"
+msgstr "4x6"
+
+#. Radio button for cropping page to A3
+#: src/app-window.ui:397
+msgid "A_3"
+msgstr "എ 3 (A_3)"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:408
+msgid "_Custom"
+msgstr "സമ്പ്രദായം (_Custom)"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:426
+msgid "_Rotate Crop"
+msgstr "മുറിച്ച ഭാഗം കറക്കുക (_R)"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:439
+msgid "Move Left"
+msgstr "ഇടത്തേക്ക് നീക്കുക"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:448
+msgid "Move Right"
+msgstr "വലത്തേക്ക് നീക്കുക"
+
+#. Label on help menu
+#: src/app-window.ui:485
+msgid "_Help"
+msgstr "സഹായം(_h)"
+
+#. Help|Contents menu
+#: src/app-window.ui:493
+msgid "_Contents"
+msgstr "ഉളളടക്കം(_Content)"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:531 src/app-window.ui:731
+msgid "Scan a single page from the scanner"
+msgstr "സ്കാനറിൽ നിന്ന് ഒറ്റ പേജ് സ്കാൻ ചെയ്യുക"
+
+#. Label on scan toolbar item
+#: src/app-window.ui:533 src/app-window.ui:727
+msgid "Scan"
+msgstr "സ്കാൻ"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:549 src/app-window.ui:798
+msgid "Save document to a file"
+msgstr "ഒരു ഡോക്യുമെന്റ്‌ ഫയലിൽ സംരക്ഷിക്കുക"
+
+#: src/app-window.ui:551
+msgid "Save"
+msgstr "സംരക്ഷിക്കുക"
+
+#. Tooltip for stop button
+#: src/app-window.ui:566 src/app-window.ui:711
+msgid "Stop the current scan"
+msgstr "നിലവിലെ സ്കാൻ നിർത്തിവയ്ക്കുക"
+
+#: src/app-window.ui:567 src/app-window.ui:708
+msgid "Stop"
+msgstr "നിർത്തുക"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:622
+msgid "Searching for Scanners…"
+msgstr "സ്കാനറുകൾ തിരയുന്നു ..."
+
+#: src/app-window.vala:239 src/app-window.vala:1391
+msgid "_Close"
+msgstr "അടയ്ക്കുക (_Close)"
+
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:248
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "അനുമതിക്കായി ഉപഭോക്തൃനാമവും രഹസ്യവാക്കും ആവശ്യമാണ് \"%s\""
+
+#. Label shown when detected a scanner
+#: src/app-window.vala:268 src/app-window.vala:586
+msgid "Ready to Scan"
+msgstr "സ്കാൻ ചെയ്യാൻ തയ്യാറാണ്"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:275
+msgid "Additional software needed"
+msgstr "കൂടുതൽ സോഫ്റ്റ്‌വെയർ ആവശ്യമാണ്"
+
+#. Instructions to install driver software
+#: src/app-window.vala:277
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr ""
+"നിങ്ങളുടെ സ്കാനറിന്റെ <a href=\"install-firmware\">ഡ്രൈവര്‍ സോഫ്റ്റ്‌വെയർ ഇന്‍സ്റ്റാള്‍ </a> "
+"ചെയ്യുക."
+
+#. Warning displayed when no scanners are detected
+#: src/app-window.vala:283
+msgid "No scanners detected"
+msgstr "സ്കാനറുകളൊന്നും കണ്ടെത്തിയിട്ടില്ല"
+
+#. Hint to user on why there are no scanners detected
+#: src/app-window.vala:285
+msgid "Please check your scanner is connected and powered on"
+msgstr "നിങ്ങളുടെ സ്കാനർ ബന്ധിപ്പിച്ചിട്ടുണ്ടോ എന്നും വൈദ്യുതിയുണ്ടോ എന്നും പരിശോധിക്കുക"
+
+#. Save dialog: Dialog title
+#: src/app-window.vala:300
+msgid "Save As…"
+msgstr "സൂക്ഷിക്കേണ്ട ഫോർമാറ്റ്"
+
+#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
+msgid "_Cancel"
+msgstr "റദ്ദാക്കുക (_Cancel)"
+
+#: src/app-window.vala:304 src/app-window.vala:555
+msgid "_Save"
+msgstr "സൂക്ഷിക്കുക (_S)"
+
+#. Default filename to use when saving document
+#: src/app-window.vala:312
+msgid "Scanned Document.pdf"
+msgstr "Scanned Document.pdf"
+
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:318
+msgid "Image Files"
+msgstr "ചിത്ര ഫയലുകൾ"
+
+#. Save dialog: Filter name to show all files
+#: src/app-window.vala:328
+msgid "All Files"
+msgstr "എല്ലാ ഫയലുകളും"
+
+#. Save dialog: Label for saving in PDF format
+#: src/app-window.vala:337
+msgid "PDF (multi-page document)"
+msgstr "PDF (പല പേജുകൾ ഉള്ള ഡോക്യുമെന്റ്‌)"
+
+#. Save dialog: Label for saving in JPEG format
+#: src/app-window.vala:343
+msgid "JPEG (compressed)"
+msgstr "JPEG (ചുരുക്കിയത്)"
+
+#. Save dialog: Label for saving in PNG format
+#: src/app-window.vala:349
+msgid "PNG (lossless)"
+msgstr "PNG (നഷ്ടം സംഭവിക്കാത്തത്)"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:356
+msgid "WebP (compressed)"
+msgstr "WebP (ചുരുക്കിയത്)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:366
+msgid "File format:"
+msgstr "ഫയൽ ഫോർമാറ്റ്:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:378
+msgid "Compression:"
+msgstr "ചുരുക്കലിന്റെ തോത്:"
+
+#. 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
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "\"%s\" പേരിൽ ഒരു ഫയൽ നിലവിലുണ്ട്. അത് പുനഃസ്ഥാപിക്കണോ?"
+
+#. 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
+msgid "_Replace"
+msgstr "പുനഃസ്ഥാപിക്കുക (_Replace)"
+
+#: src/app-window.vala:514
+msgid "Saving"
+msgstr "സൂക്ഷിക്കുന്നു"
+
+#. Title of error dialog when save failed
+#: src/app-window.vala:529
+msgid "Failed to save file"
+msgstr "ഫയൽ സൂക്ഷിക്കുന്നതിൽ പരാജയപ്പെട്ടു"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:552
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "ഫയൽ സൂക്ഷിച്ചില്ലെങ്കിൽ മാറ്റങ്ങൾ എന്നെന്നേക്കുമായി നഷ്ടപ്പെടും."
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:593
+msgid "Save current document?"
+msgstr "നിലവിലെ ഡോക്യുമെന്റ്‌ സൂക്ഷിക്കട്ടെ?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: src/app-window.vala:595
+msgid "Discard Changes"
+msgstr "മാറ്റങ്ങൾ നിരാകരിക്കുക"
+
+#. Label shown when scan started
+#: src/app-window.vala:694
+msgid "Contacting scanner…"
+msgstr "സ്കാനറുമായി ബന്ധപ്പെടുന്നു..."
+
+#. Error message display when unable to save image for preview
+#: src/app-window.vala:804
+msgid "Unable to save image for preview"
+msgstr "ചിത്രത്തിന്റെ പ്രിവ്യൂവിനായി സൂക്ഷിക്കാൻ കഴിയുന്നില്ല"
+
+#. Error message display when unable to preview image
+#: src/app-window.vala:816
+msgid "Unable to open image preview application"
+msgstr "ഇമേജ് പ്രിവ്യൂ അപ്ളിക്കേഷൻ തുറക്കാൻ കഴിയുന്നില്ല"
+
+#. Label on button for combining sides in reordering dialog
+#: src/app-window.vala:1001
+msgid "Combine sides"
+msgstr "വശങ്ങൾ ചേർക്കുക"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/app-window.vala:1011
+msgid "Combine sides (reverse)"
+msgstr "വശങ്ങൾ ചേർക്കുക (വിപരീതമായി)"
+
+#. Label on button for reversing in reordering dialog
+#: src/app-window.vala:1021
+msgid "Reverse"
+msgstr "വിപരീതമായി"
+
+#. Label on button for cancelling page reordering dialog
+#: src/app-window.vala:1031
+msgid "Keep unchanged"
+msgstr "മാറ്റമില്ലാതെ സൂക്ഷിക്കുക"
+
+#. Error message displayed when unable to launch help browser
+#: src/app-window.vala:1261
+msgid "Unable to open help file"
+msgstr "'സഹായം' ഫയൽ തുറക്കാൻ കഴിയുന്നില്ല"
+
+# Confused with the translation of warranty terms
+#. The license this software is under (GPL3+)
+#: src/app-window.vala:1282
+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"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"ഇത് ഒരു സ്വതന്ത്ര സോഫ്റ്റ്വെയര്‍ ആണ്: നിങ്ങള്‍ക്ക് സ്വതന്ത്ര സോഫ്റ്റ്വെയര്‍ പ്രസ്ഥാനം\n"
+"പ്രസിദ്ധീകരിച്ച ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ മൂന്നാം പതിപ്പിലെയോ,\n"
+"അല്ലെങ്കില്‍ (നിങ്ങളുടെ അഭിപ്രായത്തില്‍ ) ഏതെങ്കിലും പുതിയ പതിപ്പിലെയോ നിബന്ധനകള്‍ക്ക് "
+"വിധേയമായി\n"
+"മാറ്റം വരുത്തുവാനോ പുനര്‍വിതരണം ചെയ്യുവാനോ സാധിക്കുന്നതാണ്.\n"
+"‌\n"
+"ഈ സോഫ്റ്റ്വെയര്‍  ഭാവിയില്‍ ഉപയോഗപ്രദമാകുമെന്ന പ്രതീക്ഷയില്‍ , \n"
+"വാറന്റിയൊന്നും കൂടാതെ, പ്രത്യേകിച്ച് വ്യാപാരയോഗ്യമെന്നോ \n"
+"ഒരു പ്രത്യേക ആവശ്യത്തിന് പര്യാപ്തമെന്നോ ഉള്ള ‌‌‌‌ ‌‌‌‌‌‌‌‌‌‌‌\n"
+"ഉറപ്പ് പോലും നല്‍കുന്നില്ല. കൂടുതല്‍ വിവരങ്ങള്‍ക്ക്  ‌‌‌‌ ‌‌‌‌‌‌‌‌‌‌‌\n"
+"ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സ് കാണുക.  ‌‌‌‌ ‌‌‌‌‌‌‌‌‌‌‌\n"
+" ‌‌‌‌ ‌‌‌‌‌‌‌‌‌‌‌\n"
+" ‌‌‌‌ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു കോപ്പി ഈ പ്രോഗ്രാമിനൊപ്പം \n"
+"ലഭിക്കുന്നതാണ്. കിട്ടിയില്ലെങ്കില്‍  <http://www.gnu.org/licenses/> കാണുക ‌‌‌‌‌‌‌‌‌‌‌"
+
+#. Title of about dialog
+#: src/app-window.vala:1285
+msgid "About Simple Scan"
+msgstr "സിംപിൾ സ്കാനിനെ കുറിച്ച്"
+
+#. Description of program
+#: src/app-window.vala:1288
+msgid "Simple document scanning tool"
+msgstr "ലളിതമായ ഡോക്യുമെന്റ്‌ സ്കാനിങ് ഉപകരണം"
+
+#: src/app-window.vala:1297
+msgid "translator-credits"
+msgstr "translator-credits"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1319
+msgid "Save document before quitting?"
+msgstr "പുറത്തുകടക്കുന്നതിന് മുൻപ് ഡോക്യുമെന്റ്‌ സൂക്ഷിക്കട്ടെ?"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1321
+msgid "Quit without Saving"
+msgstr "സൂക്ഷിക്കാതെ പുറത്തുകടക്കുക"
+
+#. Message to indicate a Brother scanner has been detected
+#: src/app-window.vala:1368
+msgid "You appear to have a Brother scanner."
+msgstr "നിങ്ങൾക്ക് ബ്രദർ സ്കാനർ ഉള്ളതായി കാണുന്നു."
+
+#. Instructions on how to install Brother scanner drivers
+#: src/app-window.vala:1370
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+"ഇതിനായുള്ള ഡ്രൈവർ <a href=\"http://support.brother.com\">Brother website</a> ല്‍ "
+"ലഭ്യമാണ്."
+
+#. Message to indicate a Samsung scanner has been detected
+#: src/app-window.vala:1374
+msgid "You appear to have a Samsung scanner."
+msgstr "നിങ്ങൾക്ക് സാംസങ് സ്കാനർ ഉള്ളതായി കാണുന്നു."
+
+#. Instructions on how to install Samsung scanner drivers
+#: src/app-window.vala:1376
+msgid ""
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
+msgstr ""
+"ഇതിനായുള്ള ഡ്രൈവർ <a href=\"http://samsung.com/support\">Samsung website</a> ല്‍ "
+"ലഭ്യമാണ്."
+
+#. Message to indicate a HP scanner has been detected
+#: src/app-window.vala:1380
+msgid "You appear to have an HP scanner."
+msgstr "നിങ്ങൾക്ക് എച്പി സ്കാനർ ഉള്ളതായി കാണുന്നു."
+
+#. Message to indicate an Epson scanner has been detected
+#: src/app-window.vala:1385
+msgid "You appear to have an Epson scanner."
+msgstr "നിങ്ങൾക്ക് എപ്സണ്‍ സ്കാനർ ഉള്ളതായി കാണുന്നു."
+
+#. Instructions on how to install Epson scanner drivers
+#: src/app-window.vala:1387
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+"ഇതിനായുള്ള ഡ്രൈവർ <a href=\"http://support.epson.com\">Epson website</a> ല്‍ "
+"ലഭ്യമാണ്."
+
+#. Title of dialog giving instructions on how to install drivers
+#: src/app-window.vala:1391
+msgid "Install drivers"
+msgstr "ഡ്രൈവറുകൾ ഇൻസ്റ്റാൾ ചെയ്യുക"
+
+#. Message in driver install dialog
+#: src/app-window.vala:1422
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "ഇൻസ്റ്റാൾ ചെയ്‌ത ശേഷം നിങ്ങള്‍ സിംപിൾ സ്കാൻ വീണ്ടും തുറക്കേണ്ടതായി വരും."
+
+#. Label shown while installing drivers
+#: src/app-window.vala:1434
+msgid "Installing drivers…"
+msgstr "ഡ്രൈവർ ഇൻസ്റ്റാൾ ചെയ്യുന്നു..."
+
+#. Label shown once drivers successfully installed
+#: src/app-window.vala:1442
+msgid "Drivers installed successfully!"
+msgstr "ഡ്രൈവർ വിജയകരമായി ഇൻസ്റ്റാൾ ചെയ്തു!"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1452
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "ഡ്രൈവർ ഇൻസ്റ്റാൾ ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു( error code %d)"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1458
+msgid "Failed to install drivers."
+msgstr "ഡ്രൈവർ ഇൻസ്റ്റാൾ ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/app-window.vala:1465
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "നിങ്ങൾ %s പാക്കേജ് ഇൻസ്റ്റാൾ ചെയ്യേണ്ടതുണ്ട്."
+msgstr[1] "നിങ്ങൾ %s പാക്കേജുകൾ ഇൻസ്റ്റാൾ ചെയ്യേണ്ടതുണ്ട്."
+
+#: src/app-window.vala:1585
+msgid "Email"
+msgstr "ഈമെയിൽ"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "മുൻഗണനകൾ"
+
+#: src/app-window.vala:1590
+msgid "Keyboard Shortcuts"
+msgstr "കീബോർഡ് കുറുക്കുവഴികൾ"
+
+#: src/app-window.vala:1591
+msgid "Help"
+msgstr "സഹായം"
+
+#: src/app-window.vala:1592
+msgid "About"
+msgstr "അതേക്കുറിച്ച്"
+
+#. 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
+msgid "Start Again…"
+msgstr "വീണ്ടും തുടങ്ങുക..."
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1617
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "പേജിനെ ഇടത്തേക്ക് കറക്കുക (ക്ളോക്കിന് വിപരീതമായി)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1624
+msgid "Rotate the page to the right (clockwise)"
+msgstr "പേജിനെ വലത്തേക്ക് കറക്കുക (ക്ളോക്കിന് അനുസൃതമായി)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1634
+msgid "Crop the selected page"
+msgstr "തിരഞ്ഞെടുത്ത പേജ് മുറിക്കുക"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1650
+msgid "Delete the selected page"
+msgstr "തിരഞ്ഞെടുത്ത പേജ് മനസ്സിലാക്കുക"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1815
+msgid "Cancel"
+msgstr "റദ്ദാക്കുക"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "അവകാശം ഉറപ്പിക്കുക (_A)"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "സ്രോതസ്സിന്റെ ഉപഭോക്തൃനാമം (U):"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "രഹസ്യവാക്ക് (_Pass):"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "പേജ് %i എൻകോഡ് ചെയ്യാൻ സാധിക്കുന്നില്ല"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "സ്കാൻ ചെയ്യുന്നു"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "ഒറ്റപ്പേജ് മാത്രം സ്കാൻ ചെയ്യുക"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "ഡോക്യുമെന്റിലെ എല്ലാ പേജുകളും സ്കാൻ ചെയ്യുക"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "ഫ്ളാറ്റ്ബെഡ്‌ സ്കാനറിൽ തുടർച്ചയായി സ്കാൻ ചെയ്യുക"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "തുടർന്നുകൊണ്ടിരിക്കുന്ന സ്കാനിങ് നിർത്തുക"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "ഡോക്യുമെന്റ്‌ പരിഷ്കരണം"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "പേജ് ഇടത്തേക്ക് നീക്കുക"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "പേജ് വലത്തേക്ക് നീക്കുക"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "പേജിനെ ഇടത്തേക്ക് കറക്കുക (ക്ളോക്കിന് വിപരീതമായി)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "പേജിനെ വലത്തേക്ക് കറക്കുക (ക്ളോക്കിന് അനുസൃതമായി)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "പേജ് നീക്കം ചെയ്യുക"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "ഡോക്യുമെന്റ്‌ പരിപാലനം"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "പുതിയ ഡോക്യുമെന്റ്‌ തുടങ്ങുക"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "സ്കാൻ ചെയ്ത ഡോക്യുമെന്റ്‌ സൂക്ഷിക്കുക"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "സ്കാൻ ചെയ്ത ഡോക്യുമെന്റ് ഈമെയിൽ ചെയ്യുക"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "സ്കാൻ ചെയ്ത ഡോക്യുമെന്റ്‌ പ്രിന്റ് ചെയ്യുക"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "നിലവിലെ പേജ് ക്ലിപ്ബോർഡിലേക്ക് പകർത്തുക"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "സ്കാനർ (_scanner)"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "വശങ്ങൾ സ്കാൻ ചെയ്യുക"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "പേജ് വലിപ്പം"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "മുൻവശം"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "പിൻവശം"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "രണ്ടു വശവും"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "കാലതാമസം"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "ഫ്‌ളാറ്റ്ബെഡിൽ നിന്നും പല പേജുകൾ"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "സെക്കന്റുകൾ"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "സ്‌കാനിംഗ്"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "ടെക്സ്റ്റ് റെസൊല്യൂഷന്‍ (_T)"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "ഫോട്ടോ റെസൊല്യൂഷന്‍ (_P)"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "തെളിച്ചം"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "കോണ്ട്രാസ്റ്റ്"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "നിലവാരം"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "തനിയെ"
+
+#: src/preferences-dialog.vala:118
+msgid "Darker"
+msgstr "ഇരുണ്ട്"
+
+#: src/preferences-dialog.vala:120
+msgid "Lighter"
+msgstr "ശോഭയോടെ"
+
+#: src/preferences-dialog.vala:128
+msgid "Less"
+msgstr "കുറച്ചു"
+
+#: src/preferences-dialog.vala:130
+msgid "More"
+msgstr "കൂടുതൽ"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:442
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ഡിപിഐ (സ്വതവേ ഉള്ള മൂല്യം)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:445
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d ഡിപിഐ (കരട്)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:448
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d ഡിപിഐ (കൂടിയ റെസൊല്യൂഷന്‍)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:451
+#, c-format
+msgid "%d dpi"
+msgstr "%d ഡിപിഐ"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "സ്കനാറുകൾ ലഭ്യമല്ല. ദയവായി സ്കാനർ ബന്ധിപ്പിക്കുക."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "സ്കാനറുമായി ബന്ധപ്പെവാൻ കഴിയുന്നില്ല"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "സ്കാൻ തുടങ്ങാൻ കഴിയുന്നില്ല"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1347
+msgid "Error communicating with scanner"
+msgstr "സ്കാനറുമായി ബന്ധപ്പെടുന്നതിൽ പിഴവ്"
+
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "പ്രസിദ്ധപ്പെടുത്തിയ പതിപ്പ് കാണിക്കുക"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "ഡീബഗ് സന്ദേശങ്ങൾ പ്രിന്റ് ചെയ്യുക"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "സിംപിൾ സ്കാനിന്റെ പഴയ പതിപ്പിൽ ഉണ്ടാക്കിയ പിഡിഎഫ് ഫയലുകൾ ശരിയാക്കുക"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:393
+msgid "Failed to scan"
+msgstr "സ്കാൻ ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:408
+msgid "Scan in progress"
+msgstr "സ്കാൻ പുരോഗമിക്കുന്നു"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:585
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — സ്കാനിങ് ഉപകരണം"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:596
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "ലഭ്യമായിട്ടുള്ള കമാൻഡ്‌ലൈൻ ഓപ്‌ഷനുകൾക്കായി \"%s --help\" പ്രവർത്തിപ്പിക്കുക."
+
+#~ msgid "_Image"
+#~ msgstr "ചിത്രം (_Image)"
+
+#~ msgid "Quit"
+#~ msgstr "നിർത്തുക"
diff --git a/po/nl.po b/po/nl.po
index 3dc6ee9..227ed2f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,23 +2,23 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 #
-# Nathan Follens <nthn@unseen.is>, 2017.
+# Nathan Follens <nthn@unseen.is>, 2017, 2019.
 # Hannie Dumoleyn <hannie@ubuntu-nl.org>, 2017, 2018.
 # Justin van Steijn <jvs@fsfe.org>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-08-20 13:15+0100\n"
-"Last-Translator: Justin van Steijn <jvs@fsfe.org>\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-24 11:59+0100\n"
+"Last-Translator: Nathan Follens <nthn@unseen.is>\n"
 "Language-Team: Dutch <gnome-nl-list@gnome.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -27,7 +27,7 @@ msgstr "Te gebruiken scanapparaat"
 
 #: data/org.gnome.SimpleScan.gschema.xml:12
 msgid "SANE device to acquire images from."
-msgstr "SANE-apparaat om beeld van te ontvangen"
+msgstr "SANE-apparaat om beeld van te ontvangen."
 
 #: data/org.gnome.SimpleScan.gschema.xml:20
 msgid "Type of document being scanned"
@@ -141,7 +141,7 @@ msgstr "Vertraging tussen pagina's in milliseconden."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Scannen"
 
@@ -181,207 +181,152 @@ msgstr "scan;scanner;flatbed;adf;"
 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 "Enkele _pagina"
-
-#. 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 pagina's van in_voer"
-
-#. 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 "_Meerdere pagina's van vlakbed"
-
-#: 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 "Foto"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Document"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Sc_annen"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Scannen staken"
-
-#. 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 "Bladzijden herschikken"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-mailen"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Pagina"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "_Linksom draaien"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "_Rechtsom draaien"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Bijsnijden"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "VS _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "VS Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Aangepast"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "Bijsnijden d_raaien"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Naar links verplaatsen"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Naar rechts verplaatsen"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Hulp"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Inhoud"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Stoppen"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Een enkele pagina scannen"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "De huidige scan stoppen"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Scannen"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Een enkele pagina scannen"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Document naar een bestand opslaan"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Opslaan"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Enkele pagina"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "De huidige scan stoppen"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Alle pagina's van in_voer"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Stoppen"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Meerdere pagina's van vlakbed"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Zoeken naar scanners…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Tekst"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Afbeelding"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Sluiten"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Gebruikersnaam en wachtwoord vereist om toegang te krijgen tot  ‘%s’"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Zoeken naar scanners…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Klaar om te scannen"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Extra programmatuur vereist"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -390,150 +335,156 @@ msgstr ""
 "voor uw scanner."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Geen scanners gevonden"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controleer of uw scanner is aangesloten en is ingeschakeld"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Opslaan als…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Annuleren"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Opslaan"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Annuleren"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Gescand document.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Afbeeldingsbestanden"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Alle bestanden"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (document met meerdere pagina's)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (gecomprimeerd)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (gecomprimeerd)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Bestandsformaat:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Compressie:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Het bestand ‘%s’ bestaat al. Wilt u het vervangen?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "Ve_rvangen"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Bezig met opslaan"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Bestand opslaan mislukt"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Als u niet opslaat, zullen wijzigingen permanent verloren gaan."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Huidige document opslaan?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Wijzigingen negeren"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Contact maken met _Scanner…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Opslaan van afbeelding voor voorvertoning mislukt"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Bladzijden herschikken"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Zijden samenvoegen"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Zijden samenvoegen (omgekeerd)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Omgekeerd"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Onveranderd laten"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -564,23 +515,24 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Nathan Follens\n"
 "Justin van Steijn\n"
+"\n"
 "Meer info over Gnome-NL http://nl.gnome.org\n"
 "\n"
-"Launchpad Contributions:\n"
+"Launchpad-bijdragen:\n"
 "  Dionysos https://launchpad.net/~dionysoz\n"
 "  Elco https://launchpad.net/~eajnab\n"
 "  Hannie Dumoleyn https://launchpad.net/~lafeber-dumoleyn\n"
@@ -602,22 +554,22 @@ msgstr ""
 "  rob https://launchpad.net/~rvdb"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Document opslaan voor afsluiten?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "U lijkt een Brother-scanner te hebben."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -626,12 +578,12 @@ msgstr ""
 "brother.com\">website van Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "U lijkt een Samsung-scanner te hebben."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -640,17 +592,17 @@ msgstr ""
 "com/support\">website van Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "U lijkt een HP-scanner te hebben."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "U lijkt een Epson-scanner te hebben."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -659,109 +611,110 @@ msgstr ""
 "epson.com\">Epson-website</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Stuurprogramma's installeren"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Eenmaal geïnstalleerd, zult u Simple Scan moeten herstarten."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Installeren van stuurprogramma's…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Stuurprogramma's met succes geïnstalleerd!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Installeren van stuurprogramma's mislukt (foutcode %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Installeren van stuurprogramma's mislukt."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "U dient het %s pakket te installeren."
 msgstr[1] "U dient de %s pakketten te installeren."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "E-mail"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Bladzijden herschikken"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Hulp"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Over"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Opnieuw starten…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "De pagina linksom draaien (tegen de klok in)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "De pagina rechtsom draaien (met de klok mee)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "De geselecteerde pagina bijsnijden"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "De geselecteerde pagina verwijderen"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "M_achtigen"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Gebr_uikersnaam voor bron:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
@@ -856,146 +809,146 @@ msgid "Copy current page to clipboard"
 msgstr "Huidige pagina naar het klembord kopiëren"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Scanner"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Zijden scannen"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Paginagrootte"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Voorzijde"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Achterzijde"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Beide"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Vertraging"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Meerdere pagina's van vlakbed"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Seconden"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Scannen"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Tekstresolutie"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Fotoresolutie"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Helderheid"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Contrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kwaliteit"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Donkerder"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Lichter"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Minder"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Meer"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoge resolutie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -1013,12 +966,12 @@ msgid "Unable to connect to scanner"
 msgstr "Kan niet verbinden met de scanner"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Kan de scan niet starten"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Fout tijdens het communiceren met de scanner"
 
@@ -1039,28 +992,58 @@ msgstr ""
 "Scan"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Scannen is mislukt"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Scan in uitvoering"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[APPARAAT…] — Hulpmiddel voor scannen"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Voer ‘%s --help’ uit om een volledige lijst van beschikbare "
 "opdrachtregelopties te zien."
 
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Document"
+
+#~ msgid "Sc_an"
+#~ msgstr "Sc_annen"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Scannen staken"
+
+#~ msgid "_Email"
+#~ msgstr "_E-mailen"
+
+#~ msgid "_Page"
+#~ msgstr "_Pagina"
+
+#~ msgid "_Help"
+#~ msgstr "_Hulp"
+
+#~ msgid "_Contents"
+#~ msgstr "_Inhoud"
+
+#~ msgid "Save"
+#~ msgstr "Opslaan"
+
+#~ msgid "About"
+#~ msgstr "Over"
+
 #~ msgid "Quit"
 #~ msgstr "Afsluiten"
 
diff --git a/po/pl.po b/po/pl.po
index 94fc6d1..303ec16 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,15 +1,15 @@
 # Polish translation for simple-scan.
-# Copyright © 2009-2018 the simple-scan authors.
+# Copyright © 2009-2019 the simple-scan authors.
 # This file is distributed under the same license as the simple-scan package.
-# Piotr Drąg <piotrdrag@gmail.com>, 2010-2018.
-# Aviary.pl <community-poland@mozilla.org>, 2017-2018.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2019.
+# Aviary.pl <community-poland@mozilla.org>, 2017-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-08-04 19:44+0200\n"
+"POT-Creation-Date: 2019-02-07 01:56+0000\n"
+"PO-Revision-Date: 2019-02-07 13:01+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -137,7 +137,7 @@ msgstr "Opóźnienie między stronami w milisekundach."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Proste skanowanie"
 
@@ -176,206 +176,152 @@ msgstr "skan;skanowanie;skaner;scan;scanner;flatbed;adf;"
 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 "_Pojedyncza strona"
-
-#. 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 "_Wszystkie strony z podajnika"
-
-#. 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 "Wiele _stron ze skanera płaskiego"
-
-#: 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 "Zdjęcie"
-
-#. 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_anowanie"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Zatrzymaj skanowanie"
-
-#. 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 "Zmień kolejność stron"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-mail"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Strona"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Obróć w _lewo"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Obróć w p_rawo"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Kadruj"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Brak"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Niestandardowy"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "Ob_róć obszar kadrowania"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Przesuń w lewo"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Przesuń w prawo"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "Pomo_c"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Spis treści"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Zatrzymaj"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Skanuje pojedynczą stronę ze skanera"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Zatrzymuje bieżące skanowanie"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Skanuj"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Skanuje pojedynczą stronę ze skanera"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Zapisuje dokument do pliku"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Zapisz"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Pojedyncza strona"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Zatrzymuje bieżące skanowanie"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "_Wszystkie strony z podajnika"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Zatrzymaj"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "Wiele _stron ze skanera płaskiego"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Wyszukiwanie skanerów…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Tekst"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Obraz"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "Za_mknij"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Uzyskanie dostępu do „%s” wymaga podania nazwy użytkownika i hasła"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Wyszukiwanie skanerów…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Można rozpocząć skanowanie"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Wymagane jest dodatkowe oprogramowanie"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -383,150 +329,156 @@ msgstr ""
 "Należy <a href=\"install-firmware\">zainstalować sterownik</a> skanera."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Nie wykryto żadnego skanera"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Zapis jako…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Anuluj"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Zapisz"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Anuluj"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Zeskanowany dokument.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument wielostronicowy)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (skompresowany)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratny)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (skompresowany)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Format pliku:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Kompresja:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Plik o nazwie „%s” już istnieje. Zastąpić go?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Zastąp"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Zapisywanie"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Zapisanie pliku się nie powiodło"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Zmiany zostaną bezpowrotnie utracone, jeśli nie zostaną zapisane."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Zapisać bieżący dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Odrzuć zmiany"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Łączenie ze skanerem…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Nie można zapisać podglądu obrazu"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Nie można otworzyć programu podglądu obrazów"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Zmiana kolejności stron"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Połącz strony"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Połącz strony (odwrotnie)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Odwrotnie"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Bez zmiany"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -557,20 +509,20 @@ msgstr ""
 "— proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "O programie"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
-"Piotr Drąg <piotrdrag@gmail.com>, 2010-2018\n"
-"Aviary.pl <community-poland@mozilla.org>, 2017-2018\n"
+"Piotr Drąg <piotrdrag@gmail.com>, 2010-2019\n"
+"Aviary.pl <community-poland@mozilla.org>, 2017-2019\n"
 "\n"
 "Launchpad Contributions:\n"
 "  Arkadiusz Błasiak https://launchpad.net/~ares1112\n"
@@ -588,22 +540,22 @@ msgstr ""
 "  Wiatrak https://launchpad.net/~wiatrak."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Zapisać dokument przed zakończeniem programu?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Wykryto skaner marki Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -612,12 +564,12 @@ msgstr ""
 "brother.com\">stronie firmy Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Wykryto skaner marki Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -626,17 +578,17 @@ msgstr ""
 "support\">stronie firmy Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Wykryto skaner marki HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Wykryto skaner marki Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -645,38 +597,38 @@ msgstr ""
 "Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Instalacja sterowników"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Po ukończeniu instalacji należy uruchomić program ponownie."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Instalowanie sterowników…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Zainstalowano sterowniki."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Zainstalowanie sterowników się nie powiodło (kod błędu %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Zainstalowanie sterowników się nie powiodło."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -684,71 +636,72 @@ msgstr[0] "Należy zainstalować pakiet %s."
 msgstr[1] "Należy zainstalować pakiety %s."
 msgstr[2] "Należy zainstalować pakiety %s."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "E-mail"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Zmień kolejność stron"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Skróty klawiszowe"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "O programie"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Nowy dokument…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Obraca stronę w lewo (przeciwnie do ruchu wskazówek zegara)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Obraca stronę w prawo (zgodnie z ruchem wskazówek zegara)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Kadruje zaznaczoną stronę"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Usuwa zaznaczoną stronę"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "Upow_ażnij"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Nazwa _użytkownika dla zasobu:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Hasło:"
 
@@ -843,146 +796,146 @@ msgid "Copy current page to clipboard"
 msgstr "Skopiowanie bieżącej strony do schowka"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Skaner"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Skanowanie stron"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Rozmiar strony"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Przód"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Tył"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Obie"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Opóźnienie"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Wiele stron ze skanera płaskiego"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "s"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Skanowanie"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Rozdzielczość tekstu"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Rozdzielczość z_djęcia"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Jasność"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Jakość"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Ciemniej"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Jaśniej"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Mniejszy"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Większy"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d DPI (domyślnie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d DPI (szkic)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d DPI (wysoka rozdzielczość)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d DPI"
@@ -998,12 +951,12 @@ msgid "Unable to connect to scanner"
 msgstr "Nie można połączyć ze skanerem"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Nie można rozpocząć skanowania"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Błąd podczas komunikacji ze skanerem"
 
@@ -1022,22 +975,22 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Naprawia pliki PDF utworzone za pomocą starszych wersji programu"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Skanowanie się nie powiodło"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Trwa skanowanie"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[URZĄDZENIE…] — narzędzie do skanowania"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c699b9d..9d35c37 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,26 +1,27 @@
 # Brazilian Portuguese translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# Copyright (c) 2009-2017 THE simple-scan'S COPYRIGHT HOLDER
+# Copyright (c) 2009-2019 THE simple-scan'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the simple-scan package.
 # Enrico Nicoletto <liverig@gmail.com>, 2017.
 # Fábio Nogueira <fnogueira@gnome.org>, 2017.
 # Isaac F. Ferreira Filho <isaacmob@riseup.net>, 2017.
-# Rafael Fontenelle <rafaelff@gnome.org>, 2017.
 # Bruno Lopes da Silva <brunolopesbldsb@gmail.com>, 2018.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2017-2019.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-09 15:05+0000\n"
-"PO-Revision-Date: 2018-07-09 15:13-0300\n"
-"Last-Translator: Bruno Lopes da Silva <brunolopesbldsb@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-20 07:37-0300\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"Language-Team: Portuguese - Brazil <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"X-Generator: Gtranslator 3.31.90\n"
 "X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -142,7 +143,7 @@ msgstr "Atraso em milissegundos entre as páginas."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Digitalização simples"
 
@@ -184,208 +185,156 @@ msgstr ""
 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 "_Página única"
-
-# Opção de alimentador manual, no qual é possível digitalizar várias páginas de uma só vez
-#. 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 "Todas as páginas a partir do ali_mentador"
-
-# Opção de scanner manual, no vidro, no qual é possível inserir apenas uma página por vez
-#. 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 "_Múltiplas páginas a partir do vidro do scanner"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Texto"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Foto"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Documento"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Digit_alizar"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "Par_ar digitalização"
-
-#. 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 "Reordenar páginas"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-mail"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Página"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Girar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Girar à di_reita"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "R_ecortar"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "_Ofício"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "Gira_r área recortada"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Mover para a esquerda"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Mover para a direita"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "A_juda"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Conteúdo"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Parar"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Digitaliza uma única página no scanner"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Interrompe a digitalização atual"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Digitalizar"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Digitaliza uma única página no scanner"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Salva o documento em um arquivo"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Salvar"
+#: src/app-window.ui:405
+#| msgid "Single _Page"
+msgid "_Single Page"
+msgstr "_Página única"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Interrompe a digitalização atual"
+# Opção de alimentador manual, no qual é possível digitalizar várias páginas de uma só vez
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Todas as páginas a partir do ali_mentador"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Parar"
+# Opção de scanner manual, no vidro, no qual é possível inserir apenas uma página por vez
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Múltiplas páginas a partir do vidro do scanner"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Procurando por scanners…"
+#: src/app-window.ui:498
+#| msgid "Text"
+msgid "_Text"
+msgstr "_Texto"
+
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Imagem"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "Fe_char"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "É necessário o nome de usuário e senha para acessar “%s”"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Procurando por scanners…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Pronto para digitalizar"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Necessário software adicional"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -394,150 +343,157 @@ msgstr ""
 "para o seu scanner."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Nenhum scanner detectado"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor, verifique se o seu scanner está conectado e ligado"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Salvar como…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Salvar"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Cancelar"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Arquivos de imagem"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Todos os arquivos"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento com múltiplas páginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (comprimido)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Formato do arquivo:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Compressão:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Já existe um arquivo com o nome “%s”. Você deseja substituí-lo?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "Subs_tituir"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Salvando"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Falha ao salvar o arquivo"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Se você não salvar, as alterações serão permanentemente perdidas."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Salvar o documento atual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Contatando o scanner…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Não foi possível salvar imagem para visualização"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir o aplicativo de visualização de imagem"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+#| msgid "Reorder Pages"
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Reordenar páginas"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Combinar os lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Combinar os lados (reverso)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o arquivo de ajuda"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -567,23 +523,23 @@ msgstr ""
 "este programa. Caso contrário, acesse <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Sobre o Digitalização simples"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Tradutores do GNOME:\n"
-"  Enrico Nicoletto <liverig@gmail.com>.\n"
-"  Fábio Nogueira <fnogueira@gnome.org>.\n"
-"  Isaac F. Ferreira Filho <isaacmob@riseup.net>.\n"
-"  Rafael Fontenelle <rafaelff@gnome.org>.\n"
+"  Enrico Nicoletto <liverig@gmail.com>\n"
+"  Fábio Nogueira <fnogueira@gnome.org>\n"
+"  Isaac F. Ferreira Filho <isaacmob@riseup.net>\n"
+"  Rafael Fontenelle <rafaelff@gnome.org>\n"
 "\n"
 "Tradutores do Launchpad:\n"
 "  André Gondim https://launchpad.net/~andregondim\n"
@@ -611,22 +567,22 @@ msgstr ""
 "  millemiglia https://launchpad.net/~dnieper650"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Salvar o documento antes de sair?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Você parece ter um scanner da Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -635,12 +591,12 @@ msgstr ""
 "\">site da Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Você parece ter um scanner da Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -649,17 +605,17 @@ msgstr ""
 "\">site da Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Você parece ter um scanner de HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Você parece ter um scanner de Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -668,110 +624,112 @@ msgstr ""
 "\">site da Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Instalar drivers"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Assim que for instalado, você precisará reiniciar o Digitalização simples."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Instalando drivers…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Drivers instalados com sucesso!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Falha ao instalar drivers (código do erro %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Falha ao instalar drivers."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Você precisa instalar o pacote %s."
 msgstr[1] "Você precisa instalar os pacotes %s."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "E-mail"
 
+#: src/app-window.vala:1534
+#| msgid "Reorder Pages"
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Reordenar páginas"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Preferências"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de teclado"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Sobre"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Começar novamente…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Gira a página à esquerda (sentido anti-horário)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Gira a página à direita (sentido horário)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Recorta a página selecionada"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Exclui a página selecionada"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Nome de _usuário para o recurso:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Senha:"
 
@@ -866,147 +824,147 @@ msgid "Copy current page to clipboard"
 msgstr "Copia a página atual para a área de transferência"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Scanner"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Lados a digitalizar"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Tamanho da página"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Frente"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Verso"
 
 # Ambos lados, e não ambas páginas
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Ambos"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Atraso"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Múltiplas páginas a partir do vidro do scanner"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Segundos"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Digitalização"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Resolução do _texto"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Resolução da _foto"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Brilho"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Contraste"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Qualidade"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Mais escuro"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Mais claro"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Menos"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Mais"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (padrão)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta resolução)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -1022,12 +980,12 @@ msgid "Unable to connect to scanner"
 msgstr "Não foi possível conectar ao scanner"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Não foi possível iniciar a digitalização"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Erro na comunicação com o scanner"
 
@@ -1047,28 +1005,58 @@ msgstr ""
 "Corrige arquivos PDF gerados em versões anteriores do Digitalização simples"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Falha ao digitalizar"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Digitalização em andamento"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[DISPOSITIVO…] — Utilitário de digitalização"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Execute “%s --help” para ver a lista completa de opções disponíveis para "
 "linha de comando."
 
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Documento"
+
+#~ msgid "Sc_an"
+#~ msgstr "Digit_alizar"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "Par_ar digitalização"
+
+#~ msgid "_Email"
+#~ msgstr "_E-mail"
+
+#~ msgid "_Page"
+#~ msgstr "_Página"
+
+#~ msgid "_Help"
+#~ msgstr "A_juda"
+
+#~ msgid "_Contents"
+#~ msgstr "_Conteúdo"
+
+#~ msgid "Save"
+#~ msgstr "Salvar"
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
 #~ msgid "Quit"
 #~ msgstr "Sair"
 
diff --git a/po/ro.po b/po/ro.po
index 7236a35..d7ee55c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,19 +8,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-07-01 23:23+0300\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-13 14:09+0100\n"
 "Last-Translator: Florentina Mușat <florentina.musat.28 [at] gmail [dot] "
 "com>\n"
-"Language-Team: Gnome Romanian Translation Team\n"
+"Language-Team: Gnome Romanian Translation Team <gnomero-list@lists."
+"sourceforge.net>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 2.2.1\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
 msgid "Device to scan from"
@@ -137,7 +139,7 @@ msgstr "Decalare în milisecunde între pagini."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Scanare simplă"
 
@@ -177,206 +179,152 @@ msgstr "scan;scanner;flatbed;adf;scaner;scana;"
 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 "O singură _pagină"
-
-#. 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 "Toate paginile de la tava cu _foi de hârtie"
-
-#. 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 "Pagini _multiple de la scanerul cu capac"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Text"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Foto"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Document"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "Sc_anează"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "Oprește _scanarea"
-
-#. 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 "Reordonare pagini"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_Email"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Pagină"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Rotește la _stânga"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Rotește la _dreapta"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "De_cupează"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Niciunul"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Scrisoare"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Personalizat"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Rotește zona decupată"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Mută la stânga"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Mută la dreapta"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Ajutor"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Cuprins"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Oprește"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Scanați o singură pagină din scaner"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Oprește scanarea curentă"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Scanează"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Scanați o singură pagină din scaner"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Salvează documentul ca fișier"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Salvează"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "O _singură pagină"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Oprește scanarea curentă"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Toate paginile de la tava cu _foi de hârtie"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Oprește"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "Pagini _multiple de la scanerul cu capac"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Se caută scanere…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Text"
+
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Imagine"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "În_chide"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Sunt necesare numele de utilizator și parola pentru a accesa „%s”"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Se caută scanere…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Gata de scanat"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Programe adiționale necesare"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -385,150 +333,156 @@ msgstr ""
 "scanerul dumneavoastră."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Nu a fost detectat niciun scaner"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificați dacă scanerul este conectat și pornit"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Salvează ca…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Anulare"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Salvează"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Anulare"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Fișiere imagine"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Toate fișierele"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (document cu mai multe pagini)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimat)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (fără pierderi)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (comprimat)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Format de fișier:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Compresie:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Un fișier numit „%s” există deja. Doriți să-l înlocuiți?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "Înlo_cuiește"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Salvare"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Salvarea fișierului a eșuat"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Dacă nu salvați, modificările vor fi pierdute definitiv."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Salvați documentul curent?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Renunță la modificări"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Se contactează scanerul…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Nu se poate salva imaginea pentru a prezenta o previzualizare"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Nu s-a putut deschide aplicația de previzualizare a imaginilor"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Reordonare pagini"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Combină fețele"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Combină fețeke (invers)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Invers"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Păstrează nemodificat"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Nu se poate deschide fișierul de ajutor"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -560,18 +514,20 @@ msgstr ""
 "licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Despre Scanare simplă"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
+"Florentina Mușat <florentina.musat.28 [at] gmail [dot] com>, 2019\n"
+"Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2019\n"
 "Launchpad Contributions:\n"
 "  Adi Roiban https://launchpad.net/~adiroiban\n"
 "  Angelescu https://launchpad.net/~titus0818\n"
@@ -583,22 +539,22 @@ msgstr ""
 "  sfantu https://launchpad.net/~sfantus1"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Salvați documentul înainte de ieșire?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Închide fără a salva"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Se pare că aveți un scaner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -607,12 +563,12 @@ msgstr ""
 "com\">situl Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Se pare că aveți un scaner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -621,17 +577,17 @@ msgstr ""
 "support\">situl Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Se pare că aveți un scaner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Se pare că aveți un scaner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -640,38 +596,38 @@ msgstr ""
 "\">situl Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Instalare drivere"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Odată instalat trebuie să reporniți Scanare Simplă."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Se instalează drivere…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Drivere instalate cu succes!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Instalarea driverelor a eșuat (cod de eroare %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Eșec la instalarea driverelor."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -679,71 +635,72 @@ msgstr[0] "Trebuie să instalați pachetul %s."
 msgstr[1] "Trebuie să instalați pachetele %s."
 msgstr[2] "Trebuie să instalați pachetele %s."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "Email"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Reordonează pagini"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Preferințe"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Scurtături de tastatură"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Ajutor"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Despre"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Începe din nou…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotește pagina la stânga (în sens invers acelor de ceasornic)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotește pagina la dreapta (în sensul acelor de ceasornic)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Decupează pagina selectată"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Șterge pagina selectată"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Anulare"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Autorizează"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Numele de _utilizator pentru resursă:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Parolă:"
 
@@ -838,146 +795,146 @@ msgid "Copy current page to clipboard"
 msgstr "Copiază pagina curentă în clipboard"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Scaner"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Părți de scanat"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Dimensiunea paginii"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Față"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Verso"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Ambele"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Decalare"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Pagini multiple de la scaner cu capac"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
-msgstr "secunde"
+msgstr "Secunde"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Scanare"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Rezoluție _text"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Rezoluție _foto"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Luminozitate"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Contrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Calitate"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automată"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Mai întunecat"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Mai luminos"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Mai puțin"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Mai mult"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (implicit)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ciornă)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezoluție înaltă)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -993,12 +950,12 @@ msgid "Unable to connect to scanner"
 msgstr "Nu s-a putut realiza conexiunea la scaner"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Nu s-a putut porni scanarea"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Eroare la comunicarea cu scanerul"
 
@@ -1019,28 +976,58 @@ msgstr ""
 "simplă"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Scanarea a eșuat"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Scanare în progres"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[DISPOZITIV…] — Utilitar pentru scanare"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Rulați „%s --help” pentru a consulta lista completă a opțiunilor pentru "
 "comenzile din lina de comandă."
 
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Document"
+
+#~ msgid "Sc_an"
+#~ msgstr "Sc_anează"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "Oprește _scanarea"
+
+#~ msgid "_Email"
+#~ msgstr "_Email"
+
+#~ msgid "_Page"
+#~ msgstr "_Pagină"
+
+#~ msgid "_Help"
+#~ msgstr "_Ajutor"
+
+#~ msgid "_Contents"
+#~ msgstr "_Cuprins"
+
+#~ msgid "Save"
+#~ msgstr "Salvează"
+
+#~ msgid "About"
+#~ msgstr "Despre"
+
 #~ msgid "Quit"
 #~ msgstr "Închide"
 
diff --git a/po/ru.po b/po/ru.po
index 6bfa821..d2de9ec 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,15 +2,15 @@
 # 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.
-# Stas Solovey <whats_up@tut.by>, 2017.
+# Stas Solovey <whats_up@tut.by>, 2017-2018, 2019.
 # Роман Верменко <dargodet@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\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-09-07 00:09+0300\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-25 21:24+0300\n"
 "Last-Translator: Stas Solovey <whats_up@tut.by>\n"
 "Language-Team: русский <>\n"
 "Language: ru\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -133,7 +133,7 @@ msgstr "Задержка в миллисекундах между страниц
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Простое сканирование"
 
@@ -173,206 +173,152 @@ msgstr "сканировать;сканер;планшетный;автопод�
 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 "Одна _страница"
-
-#. 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 "Все страницы из _автоподатчика"
-
-#. 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 "_Несколько страниц с планшета"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Текст"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Фотография"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Документ"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "_Сканировать"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Остановить сканирование"
-
-#. 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 "Организация страниц"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "Отправить _почтой"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Страница"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Повернуть в_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Повернуть в_право"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Обрезать"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Нет"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Другое"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Повернуть выбранное"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Переместить влево"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Переместить вправо"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Справка"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Содержание"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Остановить"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Сканировать одну страницу со сканера"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Прервать выполняемое сканирование"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Сканировать"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Сканировать одну страницу со сканера"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Сохранить"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "Одна _страница"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Прервать выполняемое сканирование"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Все страницы из _автоподатчика"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Остановить"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Несколько страниц с планшета"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Поиск сканеров…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Текст"
+
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Изображение"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Закрыть"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Требуется имя пользователя и пароль для доступа к «%s»"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Поиск сканеров…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Готово к сканированию"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Необходимо дополнительное программное обеспечение"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -381,150 +327,156 @@ msgstr ""
 "сканера."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Сканеры не обнаружены"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверьте, что сканер подсоединён и включён"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Сохранить как…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Отменить"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "Со_хранить"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Отменить"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Файлы изображений"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Все файлы"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (многостраничный документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (сжатый)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (без потерь в качестве)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (сжатый)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Формат файла:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Сжатие:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Файл с именем «%s» уже существует. Заменить его?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Сохранение"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Не удалось сохранить файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Если не выполнить сохранение, все изменения будут утеряны."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Соединение со сканером…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Не удалось сохранить изображение для предварительного просмотра"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Не удалось открыть программу для просмотра изображений"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Организация страниц"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Объединить стороны"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Объединить стороны (в обратном порядке)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "В обратном порядке"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Оставить без изменений"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -553,38 +505,38 @@ msgstr ""
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "О приложении"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Stas Solovey <whats_up@tut.by>, 2015-2018\n"
 "Роман Верменко <dargodet@gmail.com>, 2017"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Похоже, у вас сканер компании Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -593,12 +545,12 @@ msgstr ""
 "\">веб-сайте Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Похоже, у вас сканер компании Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -607,17 +559,17 @@ msgstr ""
 "\">веб-сайте Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Похоже, у вас сканер компании HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Похоже, у вас сканер компании Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -626,38 +578,38 @@ msgstr ""
 "\">веб-сайте Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Установка драйверов"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "После установки необходимо перезапустить Simple Scan."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Установка драйверов…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Драйверы успешно установлены!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Не удалось установить драйверы (код ошибки %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Не удалось установить драйверы."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -665,71 +617,72 @@ msgstr[0] "Необходимо установить %s пакет"
 msgstr[1] "Необходимо установить %s пакета"
 msgstr[2] "Необходимо установить %s пакетов"
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "Эл. почта"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Организация страниц"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Параметры"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Комбинации клавиш"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Справка"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "О приложении"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Начать заново…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Повернуть страницу влево (против часовой стрелки)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Повернуть страницу вправо (по часовой стрелке)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Обрезать выбранную страницу"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Удалить выбранную страницу"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Отменить"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "Р_азрешить"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Имя поль_зователя для ресурса:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Пароль:"
 
@@ -824,146 +777,146 @@ msgid "Copy current page to clipboard"
 msgstr "Копировать текущую страницу в буфер обмена"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Сканер"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Сканируемые стороны"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Размер листа"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Лицевая сторона"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Обратная сторона"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Обе"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Задержка"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Несколько страниц с планшета"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Секунд"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Сканирование"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Р_азрешение текста"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Разрешение фотографии"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Яркость"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Контрастность"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Качество"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Автоматический"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Темнее"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Светлее"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Меньше"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Больше"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по умолчанию)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (высокое разрешение)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -979,12 +932,12 @@ msgid "Unable to connect to scanner"
 msgstr "Не удалось подключиться к сканеру"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Не удалось начать сканирование"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Ошибка связи со сканером"
 
@@ -1023,5 +976,35 @@ msgstr "[DEVICE…] — Устройство сканирования"
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr "Выполните «%s --help», чтобы вывести полный список доступных опций."
 
+#~ msgid "Photo"
+#~ msgstr "Фотография"
+
+#~ msgid "_Document"
+#~ msgstr "_Документ"
+
+#~ msgid "Sc_an"
+#~ msgstr "_Сканировать"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Остановить сканирование"
+
+#~ msgid "_Email"
+#~ msgstr "Отправить _почтой"
+
+#~ msgid "_Page"
+#~ msgstr "_Страница"
+
+#~ msgid "_Help"
+#~ msgstr "_Справка"
+
+#~ msgid "_Contents"
+#~ msgstr "_Содержание"
+
+#~ msgid "Save"
+#~ msgstr "Сохранить"
+
+#~ msgid "About"
+#~ msgstr "О приложении"
+
 #~ msgid "Quit"
 #~ msgstr "Завершить"
diff --git a/po/sk.po b/po/sk.po
index 3146acd..feefae6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,23 +2,23 @@
 # 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.
-# Dušan Kazik <prescott66@gmail.com>, 2015.
+# Dušan Kazik <prescott66@gmail.com>, 2015-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\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-09-16 08:49+0200\n"
+"POT-Creation-Date: 2019-03-11 08:58+0000\n"
+"PO-Revision-Date: 2019-03-24 20:11+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
-"Language-Team: slovenčina <>\n"
+"Language-Team: slovenčina <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.1.1\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
 msgid "Device to scan from"
@@ -139,7 +139,7 @@ msgstr "Oneskorenie medzi stránkami v milisekundách."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1266 src/app-window.vala:1520
 msgid "Simple Scan"
 msgstr "Jednoduché skenovanie"
 
@@ -179,207 +179,154 @@ msgstr "skenovanie;skenovať;skener;plochý;adf;"
 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 "_Jedna stránka"
-
-#. 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 "_Všetky stránky z podávača"
-
-#. 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 "_Viacero stránok z plochého skenera"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Text"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Fotografia"
-
-#. 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 "_Skenovať"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Zastaviť skenovanie"
-
-#. 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 "Zmeniť poradie stránok"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_Email"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Stránka"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Otočiť _doľava"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Otočiť do_prava"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Orezanie"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "Žia_dne"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "US _List"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Vlastné"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Otočiť výrez"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Presunúť doľava"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Presunúť doprava"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Pomocník"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Obsah"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Zastaviť"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Naskenuje jednu stránku zo skeneru"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Zastaví aktuálne skenovanie"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Skenovať"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Naskenuje jednu stránku zo skeneru"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Uloží dokument do súboru"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Uložiť"
+#: src/app-window.ui:405
+#| msgid "Single _Page"
+msgid "_Single Page"
+msgstr "_Jedna stránka"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Zastaví aktuálne skenovanie"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "_Všetky stránky z podávača"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Zastaviť"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Viacero stránok z plochého skenera"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Vyhľadávajú sa skenery…"
+#: src/app-window.ui:498
+#| msgid "Text"
+msgid "_Text"
+msgstr "_Text"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "O_brázok"
+
+#: src/app-window.vala:221 src/app-window.vala:1353
 msgid "_Close"
 msgstr "_Zavrieť"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:230
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Meno používateľa a heslo je vyžadované pre prístup k „%s“"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:246
+msgid "Searching for Scanners…"
+msgstr "Vyhľadávajú sa skenery…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:252
 msgid "Ready to Scan"
 msgstr "Skenovanie pripravené"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:259
 msgid "Additional software needed"
 msgstr "Vyžaduje sa dodatočný softvér"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:261
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -388,150 +335,157 @@ msgstr ""
 "váš skener."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:267
 msgid "No scanners detected"
 msgstr "Nezistili sa žiadne skenery"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:269
 msgid "Please check your scanner is connected and powered on"
 msgstr "Prosím, skontrolujte, či je skener pripojený a zapnutý"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:292
 msgid "Save As…"
 msgstr "Uloženie ako…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "Z_rušiť"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:295 src/app-window.vala:549
 msgid "_Save"
 msgstr "_Uložiť"
 
+#: src/app-window.vala:296 src/app-window.vala:464 src/app-window.vala:548
+msgid "_Cancel"
+msgstr "Z_rušiť"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:303
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:309
 msgid "Image Files"
 msgstr "Súbory obrázkov"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:319
 msgid "All Files"
 msgstr "Všetky súbory"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:328
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument s viacerými stránkami)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:334
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:340
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratový)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:347
 msgid "WebP (compressed)"
 msgstr "WebP (komprimovaný)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:357
 msgid "File format:"
 msgstr "Formát súboru:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:369
 msgid "Compression:"
 msgstr "Komprimácia:"
 
 #. 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:463
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Súbor s názvom „%s“ už existuje. Chcete ho nahradiť?"
 
 #. 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:466
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:505
 msgid "Saving"
 msgstr "Ukladá sa"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Ukladanie súboru zlyhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:546
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Ak dokument neuložíte, zmeny budú natrvalo stratené."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:582
 msgid "Save current document?"
 msgstr "Uložiť aktuálny dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:584
 msgid "Discard Changes"
 msgstr "Zahodiť zmeny"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:717
 msgid "Contacting scanner…"
 msgstr "Kontaktuje sa skener…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Nepodarilo sa uložiť obraz na náhľad"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Nie je možné otvoriť aplikáciu na náhľad obrázku"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:974
+#| msgid "Reorder Pages"
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Zmena poradia stránok"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:997
 msgid "Combine sides"
 msgstr "Kombinovať strany"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1007
 msgid "Combine sides (reverse)"
 msgstr "Kombinovať strany (obrátene)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1017
 msgid "Reverse"
 msgstr "Obrátiť"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1027
 msgid "Keep unchanged"
 msgstr "Ponechať nezmenené"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1241
 msgid "Unable to open help file"
 msgstr "Nie je možné otvoriť súbor pomocníka"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1256
 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"
@@ -561,16 +515,16 @@ msgstr ""
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1259 src/app-window.vala:1541
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1262
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1271
 msgid "translator-credits"
 msgstr ""
 "Prispievatelia zo služby Launchpad:\n"
@@ -583,22 +537,22 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1287
 msgid "Save document before quitting?"
 msgstr "Uložiť dokument pred ukončením?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1289
 msgid "Quit without Saving"
 msgstr "Ukončiť bez uloženia"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1330
 msgid "You appear to have a Brother scanner."
 msgstr "Zdá sa, že máte skener značky Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1332
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -607,12 +561,12 @@ msgstr ""
 "b/countrytop.aspx?c=cz&lang=cs\">Brother website</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1336
 msgid "You appear to have a Samsung scanner."
 msgstr "Zdá sa, že máte skener značky Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1338
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -621,17 +575,17 @@ msgstr ""
 "\">Samsung website</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1342
 msgid "You appear to have an HP scanner."
 msgstr "Zdá sa, že máte skener značky HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1347
 msgid "You appear to have an Epson scanner."
 msgstr "Zdá sa, že máte skener značky Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1349
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -640,39 +594,39 @@ msgstr ""
 "viewcon/corporatesite/support\">webovej stránke výrobcu Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1353
 msgid "Install drivers"
 msgstr "Inštalácia ovládačov"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1386
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Po inštalácii budete musieť aplikáciu Jednoduché skenovanie reštartovať."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1399
 msgid "Installing drivers…"
 msgstr "Inštalujú sa ovládače…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1407
 msgid "Drivers installed successfully!"
 msgstr "Ovládače boli úspešne nainštalované!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1417
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Zlyhala inštalácia ovládačov (kód chyby %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1423
 msgid "Failed to install drivers."
 msgstr "Zlyhala inštalácia ovládačov."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1430
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -680,73 +634,75 @@ msgstr[0] "Musíte nainštalovať balík %s."
 msgstr[1] "Musíte nainštalovať balíky %s."
 msgstr[2] "Musíte nainštalovať balíky %s."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1534
 msgid "Email"
 msgstr "Email"
 
+#: src/app-window.vala:1535
+#| msgid "Reorder Pages"
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Zmeniť poradie stránok"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1538 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1539
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové skratky"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1540
 msgid "Help"
 msgstr "Pomocník"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "O programe"
-
 #. 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:1549
 msgid "Start Again…"
 msgstr "Začať odznovu…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1568
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Otočí stránku doľava (v protismere hodinových ručičiek)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1577
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Otočí stránku doprava (v smere hodinových ručičiek)"
 
 # tooltip
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1589
 msgid "Crop the selected page"
 msgstr "Oreže vybranú stránku"
 
 # tooltip
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1607
 msgid "Delete the selected page"
 msgstr "Odstráni vybranú stránku"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1751
 msgid "Cancel"
 msgstr "Zrušiť"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "Ove_riť"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Užívateľské meno pre zdroj:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Heslo:"
 
@@ -842,146 +798,146 @@ msgid "Copy current page to clipboard"
 msgstr "Skopírovanie aktuálne stránky do schránky"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Skener"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Skenované strany"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Veľkosť stránky"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Predná strana"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Zadná strana"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Obe"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Oneskorenie"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Viacero stránok z plochého skenera"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "sekúnd"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Skenovanie"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Rozlíšenie _textu"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Rozlíšenie _fotografií"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Jas"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kvalita"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatická"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Tmavší"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Svetlejší"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Menší"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Väčší"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predvolené)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (koncept)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlíšenie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -997,12 +953,12 @@ msgid "Unable to connect to scanner"
 msgstr "Nie je možné pripojiť sa ku skeneru"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Nie je možné začať skenovať"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Chyba v komunikácii so skenerom"
 
@@ -1045,6 +1001,36 @@ msgstr ""
 "Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
 "--help“."
 
+#~ msgid "Photo"
+#~ msgstr "Fotografia"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokument"
+
+#~ msgid "Sc_an"
+#~ msgstr "_Skenovať"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Zastaviť skenovanie"
+
+#~ msgid "_Email"
+#~ msgstr "_Email"
+
+#~ msgid "_Page"
+#~ msgstr "_Stránka"
+
+#~ msgid "_Help"
+#~ msgstr "_Pomocník"
+
+#~ msgid "_Contents"
+#~ msgstr "_Obsah"
+
+#~ msgid "Save"
+#~ msgstr "Uložiť"
+
+#~ msgid "About"
+#~ msgstr "O programe"
+
 #~ msgid "Quit"
 #~ msgstr "Ukončiť"
 
diff --git a/po/sl.po b/po/sl.po
index 34a343a..323d1bd 100644
--- a/po/sl.po
+++ b/po/sl.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.
 #
-# Matej Urbančič <mateju@svn.gnome.org>, 2017–2018.
+# Matej Urbančič <mateju@svn.gnome.org>, 2017–2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-30 04:24+0000\n"
-"PO-Revision-Date: 2018-08-03 11:26+0200\n"
+"POT-Creation-Date: 2019-02-09 15:41+0000\n"
+"PO-Revision-Date: 2019-02-09 20:22+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "Language: sl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.1.1\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
@@ -134,7 +134,7 @@ msgstr "Zakasnitev med branjem strani v milisekundah."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Enostavno optično branje"
 
@@ -172,208 +172,154 @@ msgstr "optični bralnik;adf;podajalnik;skener;"
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/simple-scan.desktop.in:10
 msgid "scanner"
-msgstr "optični bralnik"
-
-#. 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 "Ena _stran"
-
-#. 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 "Vse strani iz _podajalnika"
-
-#. 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 "_Več strani z namiznim optičnim bralnikom"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Besedilo"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Fotografija"
-
-#. 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 "Op_tično branje"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Zaustavi optično branje"
-
-#. 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 "Prerazporeditev strani"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_Elektronski naslov"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Stran"
+msgstr "scanner"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Zavrti _levo"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Zavrti _desno"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Obreži"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Brez"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Podaljšana stran"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Po meri"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Zavrti obrezano polje"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Premakni levo"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Premakni desno"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "Pomo_č"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Vsebina"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Zaustavi"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Optično branje ene strani iz optičnega bralnika"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Zaustavi trenutno optično branje"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Optično branje"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Optično branje ene strani iz optičnega bralnika"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Shrani dokument v datoteko"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Shrani"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "Ena _stran"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Zaustavi trenutno optično branje"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Vse strani iz _podajalnika"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Zaustavi"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Več strani z namiznim optičnim bralnikom"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Poteka iskanje optičnega bralnika ..."
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Besedilo"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Slika"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Zapri"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Za dostop do »%s« sta zahtevana uporabniško ime in geslo"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Poteka iskanje optičnega bralnika …"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Naprava je pripravljena za optično branje"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Zahtevana je dodatna programska oprema"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -382,150 +328,156 @@ msgstr ""
 "programski gonilnik</a>."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Ni zaznanega optičnega bralnika"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Preverite, ali je optični bralnik priklopljen in vklopljen"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
-msgstr "Shrani kot ..."
+msgstr "Shrani kot …"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Prekliči"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Shrani"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Prekliči"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Optično prebran dokument.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Vse datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (stisnjen)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Vrsta datoteke:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Stiskanje:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Datoteka z imenom »%s« že obstaja. Ali jo želite zamenjati?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Poteka shranjevanje"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Shranjevanje datoteke je spodletelo"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Ali želite dokument shraniti?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Zavrzi spremembe"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
-msgstr "Poteka povezovanje optičnega bralnika ..."
+msgstr "Poteka povezovanje optičnega bralnika …"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Ni mogoče shraniti slike za predogled"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Ni mogoče odpreti programa predogleda slik"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Prerazporejevanje strani"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Spoji strani"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Spoji strani (obratno)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Obrnjeno"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Ohrani nespremenjeno"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -557,16 +509,16 @@ msgstr ""
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "O programu"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Matej Urbančič <mateju@svn@gnome.org>\n"
@@ -582,22 +534,22 @@ msgstr ""
 "  grofaty"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Ali želite dokument končanjem programa shraniti?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Videti je, da je priklopljen optični bralnik Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -606,12 +558,12 @@ msgstr ""
 "com\">Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Videti je, da je priklopljen optični bralnik Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -620,17 +572,17 @@ msgstr ""
 "support\">Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Videti je, da je priklopljen optični bralnik HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Videti je, da je priklopljen optični bralnik Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -639,38 +591,38 @@ msgstr ""
 "com\">Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Namesti gonilnike"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Ko bodo paketi nameščeni, je treba program ponovno zagnati."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
-msgstr "Nameščanje gonilnikov ..."
+msgstr "Poteka nameščanje gonilnikov …"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Gonilniki so uspešno nameščeni!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Namestitev gonilnikov je spodletela (koda napake %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Namestitev gonilnikov je spodletela."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -679,71 +631,72 @@ msgstr[1] "Namestiti je treba %s paket."
 msgstr[2] "Namestiti je treba %s paketa."
 msgstr[3] "Namestiti je treba %s pakete."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "Elektronski naslov"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Prerazporedi strani"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Možnosti"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Tipkovne bližnjice"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Pomoč"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "O programu"
-
 #. 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:1548
 msgid "Start Again…"
-msgstr "Začni znova ..."
+msgstr "Začni znova …"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Obrni stran v desno (smer urinega kazalca)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Obreži izbrano stran"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Izbriši izbrano stran"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Prekliči"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Pooblasti"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Uporabniško ime za vir:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Geslo:"
 
@@ -838,146 +791,146 @@ msgid "Copy current page to clipboard"
 msgstr "Kopiraj trenutno stran v odložišče"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Optični bralnik"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Branje nasprotnih strani"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Velikost strani"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Prednja stran"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Hrbtna stran"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Obe strani"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Zakasnitev"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Več strani z namiznim optičnim bralnikom"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Sekunde"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Optično branje"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Ločljivost besedila"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Ločljivost fotografije"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Svetlost"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kakovost"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Temenjše"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Svetlejše"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Manj"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Več"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d točk na palec (privzeto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
@@ -993,12 +946,12 @@ msgid "Unable to connect to scanner"
 msgstr "Z optičnim bralnikom se ni mogoče povezati"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Optičnega branja ni mogoče začeti"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Napaka med povezovanjem optičnim bralnikom"
 
@@ -1018,26 +971,56 @@ msgstr ""
 "Popravi datoteke PDF ustvarjene s starejšimi različicami programa Simple Scan"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Optično branje je spodletelo"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Poteka optično branje dokumenta"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[NAPRAVA ...] – orodje za optično branje"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr "Za popoln seznam možnosti ukazne vrstice zaženite »%s --help«."
 
+#~ msgid "Photo"
+#~ msgstr "Fotografija"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokument"
+
+#~ msgid "Sc_an"
+#~ msgstr "Op_tično branje"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Zaustavi optično branje"
+
+#~ msgid "_Email"
+#~ msgstr "_Elektronski naslov"
+
+#~ msgid "_Page"
+#~ msgstr "_Stran"
+
+#~ msgid "_Help"
+#~ msgstr "Pomo_č"
+
+#~ msgid "_Contents"
+#~ msgstr "_Vsebina"
+
+#~ msgid "Save"
+#~ msgstr "Shrani"
+
+#~ msgid "About"
+#~ msgstr "O programu"
+
 #~ msgid "Quit"
 #~ msgstr "Izhod"
 
diff --git a/po/sr.po b/po/sr.po
index 85ae720..67d51d9 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \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-09-27 22:10+0200\n"
+"POT-Creation-Date: 2019-02-18 16:09+0000\n"
+"PO-Revision-Date: 2019-02-28 14:32+0100\n"
 "Last-Translator: Марко М. Костић <marko.m.kostic@gmail.com>\n"
 "Language-Team: Serbian\n"
 "Language: sr\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.2\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
 msgid "Device to scan from"
@@ -135,7 +135,7 @@ msgstr "Размак у милисекундама између страница
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1266 src/app-window.vala:1520
 msgid "Simple Scan"
 msgstr "Једноставно cкенирање"
 
@@ -177,206 +177,152 @@ msgstr ""
 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 "_Једонострано"
-
-#. 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 "Све странице из _фиоке скенера"
-
-#. 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 "_Више страница са положеног скенера"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Текст"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Слика"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Документ"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "_Скенирај"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Заустави скенирање"
-
-#. 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 "Промените распоред страница"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_Е-пошта"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "Ст_раница"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Ротирај на_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Ротирај на_десно"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Исеци"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Ништа"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Писмо"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "_УС легал"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Произвољно"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "Ро_тирај исечак"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Помери налево"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Помери надесно"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Помоћ"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "Садр_жај"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Заустави"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Скенирај једну стану са скенера"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Заустави скенирање"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Скенирај"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Скенирај једну стану са скенера"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Сачувај документ у датотеку"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Сачувај"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "Једоно_страно"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Заустави скенирање"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Све странице из _фиоке скенера"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Заустави"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Више страница са положеног скенера"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Тражење скенера…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Текст"
+
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "Сл_ика"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:221 src/app-window.vala:1353
 msgid "_Close"
 msgstr "_Затвори"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:230
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Име налога и лозинка који су потребни за приступ “%s”"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:246
+msgid "Searching for Scanners…"
+msgstr "Тражење скенера…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:252
 msgid "Ready to Scan"
 msgstr "Спреман за скенирање"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:259
 msgid "Additional software needed"
 msgstr "Потребан је додатни софтвер"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:261
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -385,150 +331,156 @@ msgstr ""
 "Ваш скенер."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:267
 msgid "No scanners detected"
 msgstr "Ниједан скенер није пронађен"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:269
 msgid "Please check your scanner is connected and powered on"
 msgstr "Провери да ли је скенер повезан и укључен"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:292
 msgid "Save As…"
 msgstr "Сачувај као…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Откажи"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:295 src/app-window.vala:549
 msgid "_Save"
 msgstr "_Сачувај"
 
+#: src/app-window.vala:296 src/app-window.vala:464 src/app-window.vala:548
+msgid "_Cancel"
+msgstr "_Откажи"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:303
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:309
 msgid "Image Files"
 msgstr "Датотеке слика"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:319
 msgid "All Files"
 msgstr "Све датотеке"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:328
 msgid "PDF (multi-page document)"
 msgstr "ПДФ (документ са више страна)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:334
 msgid "JPEG (compressed)"
 msgstr "ЈПЕГ (компримовани)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:340
 msgid "PNG (lossless)"
 msgstr "ПНГ (без губитака)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:347
 msgid "WebP (compressed)"
 msgstr "ВебП (компримовани)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:357
 msgid "File format:"
 msgstr "Формат датотеке:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:369
 msgid "Compression:"
 msgstr "Компресија:"
 
 #. 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:463
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Датотека са називом “%s” већ постоји.  Да ли желите да је замените?"
 
 #. 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:466
 msgid "_Replace"
 msgstr "_Замени"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:505
 msgid "Saving"
 msgstr "Чување"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Чување датотеке није успело"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:546
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Ако не сачувате измене ће бити изгубљене заувек."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:582
 msgid "Save current document?"
 msgstr "Сачувати тренутни документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:584
 msgid "Discard Changes"
 msgstr "Одбаци измене"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:717
 msgid "Contacting scanner…"
 msgstr "Контактирање скенера…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Чување пробне слике није успело"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Покретање програма за приказ слике није успело"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:974
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Промена распореда страница"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:997
 msgid "Combine sides"
 msgstr "Комбинуј странице"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1007
 msgid "Combine sides (reverse)"
 msgstr "Комбинуј странице (уназад)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1017
 msgid "Reverse"
 msgstr "Изокрени"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1027
 msgid "Keep unchanged"
 msgstr "Без измена"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1241
 msgid "Unable to open help file"
 msgstr "Није могуће отворити датотеку помоћи"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1256
 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"
@@ -557,16 +509,16 @@ msgstr ""
 "уз овај програм. Ако нисте посетите <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1259 src/app-window.vala:1541
 msgid "About Simple Scan"
 msgstr "О програму Једноставно Скенирање"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1262
 msgid "Simple document scanning tool"
 msgstr "Једноставна алатка за скенирање докумената"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1271
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -574,28 +526,28 @@ msgstr ""
 "  Kosava https://launchpad.net/~kosava\n"
 "  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
 "  Michael Hoth https://launchpad.net/~hoth-einbeck\n"
+"  Марко М. Костић https://launchpad.net/~marko-m-kostic\n"
 "  Мирослав Николић https://launchpad.net/~lipek\n"
 "Serbian GNOME Translation Project:\n"
-"  Борисав Живановић <borisavzivanovic@gmail.com>\n"
-"  Марко М. Костић <marko.m.kostic@gmail.com>"
+"  Борисав Живановић <borisavzivanovic@gmail.com>"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1287
 msgid "Save document before quitting?"
 msgstr "Да сачувам документ пре него што изађем?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1289
 msgid "Quit without Saving"
 msgstr "Затвори без чувања"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1330
 msgid "You appear to have a Brother scanner."
 msgstr "Изгледа да имате Брадеров скенер."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1332
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -604,12 +556,12 @@ msgstr ""
 "\">вебсајту Брадера</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1336
 msgid "You appear to have a Samsung scanner."
 msgstr "Изгледа да имате Самсунгов скенер."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1338
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -618,17 +570,17 @@ msgstr ""
 "\">вебсајту Самсунга</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1342
 msgid "You appear to have an HP scanner."
 msgstr "Изгледа да имате ХП-ов скенер."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1347
 msgid "You appear to have an Epson scanner."
 msgstr "Изгледа да имате Епсонов скенер."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1349
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -637,40 +589,40 @@ msgstr ""
 "\">вебсајту Епсона</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1353
 msgid "Install drivers"
 msgstr "Инталирај управљачки програм"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1386
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Када инсталирате управљачки програм морате поново покренути Једноставно "
 "Скенирање."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1399
 msgid "Installing drivers…"
 msgstr "Инсталација управљачког програма у току…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1407
 msgid "Drivers installed successfully!"
 msgstr "Управљачки програм успешно инсталиран!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1417
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Инсталација управљачког програма није успела (код грешке  %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1423
 msgid "Failed to install drivers."
 msgstr "Инсталација управљачког програма није успела."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1430
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -678,71 +630,72 @@ msgstr[0] "Морате инсталирати %s пакет"
 msgstr[1] "Морате инсталирати %s пакетa"
 msgstr[2] "Морате инсталирати %s пакетa"
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1534
 msgid "Email"
 msgstr "Е-пошта"
 
+#: src/app-window.vala:1535
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Промени распоред страница"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1538 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Поставке"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1539
 msgid "Keyboard Shortcuts"
 msgstr "Пречице на тастатури"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1540
 msgid "Help"
 msgstr "Помоћ"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "О програму"
-
 #. 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:1549
 msgid "Start Again…"
 msgstr "_Поново покрени…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1568
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Ротирај страницу налево (супротно казаљци на сату)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1577
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Ротирај страницу надесно (смер казаљке на сату)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1589
 msgid "Crop the selected page"
 msgstr "Исеци означену страницу"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1607
 msgid "Delete the selected page"
 msgstr "Обриши означену страницу"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1751
 msgid "Cancel"
 msgstr "Откажи"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "Дај _приступ"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Корисничко име:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Шифра:"
 
@@ -837,146 +790,146 @@ msgid "Copy current page to clipboard"
 msgstr "Копирање тренутне странице на оставу"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Скенер"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Странице за скенирање"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Величина странице"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Предња страна"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Задња страна"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Обе стране"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Временски размак"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Више страна са положеног скенера"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "секунди"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Скенирање"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "Резолуција _текста"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "Резолуција _слике"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Осветљење"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Контраст"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Квалитет"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Аутоматски"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Тамније"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Светлије"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Мање"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Више"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d тачака по инчу (подразумевано)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d тачака по инчу (белешка)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d тачака по инчу (висока резолуција)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d тачака по инчу"
@@ -992,12 +945,12 @@ msgid "Unable to connect to scanner"
 msgstr "Није могуће контактирати скенер"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Није могуће почети скенирање"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Грешка у комуникацији са скенером"
 
@@ -1038,5 +991,35 @@ msgid "Run “%s --help” to see a full list of available command line options.
 msgstr ""
 "Покрените “%s --help” да бисте видели листу свих опција командне линије."
 
+#~ msgid "Photo"
+#~ msgstr "Слика"
+
+#~ msgid "_Document"
+#~ msgstr "_Документ"
+
+#~ msgid "Sc_an"
+#~ msgstr "_Скенирај"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Заустави скенирање"
+
+#~ msgid "_Email"
+#~ msgstr "_Е-пошта"
+
+#~ msgid "_Page"
+#~ msgstr "Ст_раница"
+
+#~ msgid "_Help"
+#~ msgstr "_Помоћ"
+
+#~ msgid "_Contents"
+#~ msgstr "Садр_жај"
+
+#~ msgid "Save"
+#~ msgstr "Сачувај"
+
+#~ msgid "About"
+#~ msgstr "О програму"
+
 #~ msgid "Quit"
 #~ msgstr "Излаз"
diff --git a/po/sv.po b/po/sv.po
index 45b39c9..19ed9f3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,15 +1,15 @@
 # Swedish translation for simple-scan
 # Copyright © 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2017, 2018.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2017, 2018, 2019.
 # Josef Andersson <l10nl18nsweja@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-08-09 21:41+0200\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-07 21:29+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -136,7 +136,7 @@ msgstr "Fördröjning i millisekunder mellan sidor."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Enkel bildläsning"
 
@@ -176,207 +176,152 @@ msgstr "scan;scanner;flatbädd;adf;skan;skanner;bildläsare;"
 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 _sida"
-
-#. 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 "Alla sidor från _matare"
-
-#. 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 "_Flera sidor från flatbädd"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Text"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Foto"
-
-#. 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 "Skann_a"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Stoppa 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 "Ändra sidordning"
-
-#. 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 "_Sida"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Rotera åt _vänster"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Rotera åt _höger"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Beskär"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "An_passad"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Rotera beskärning"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Flytta åt vänster"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Flytta åt höger"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Hjälp"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_Innehåll"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Stoppa"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Skanna in en enstaka sida från bildläsaren"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Stoppa den aktuella skanningen"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Skanna"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Skanna in en enstaka sida från bildläsaren"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Spara dokument till en fil"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Spara"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Enkel sida"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Stoppa den aktuella skanningen"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Alla sidor från _matare"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Stoppa"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Flera sidor från flatbädd"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Söker efter bildläsare…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Text"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Bild"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Stäng"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Användarnamn och lösenord krävs för åtkomst till ”%s”"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Söker efter bildläsare…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Redo att skanna"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Ytterligare programvara behövs"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -385,150 +330,156 @@ msgstr ""
 "bildläsare."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Ingen bildläsare hittades"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollera att din bildläsare är ansluten och påslagen"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Spara 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:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Spara"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Avbryt"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Skannat dokument.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Bildfiler"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Alla filer"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidigt dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimerad)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (förlustfri)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (komprimerad)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Filformat:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Komprimering:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "En fil med namnet ”%s” finns redan.  Vill du ersätta 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:468
 msgid "_Replace"
 msgstr "E_rsätt"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Sparar"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Misslyckades med att spara filen"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Om du inte sparar så kommer ändringarna att gå förlorade."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Spara aktuellt dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Kontaktar bildläsare…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Kunde inte spara bild för förhandsvisning"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Ändra sidordning"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Kombinera sidor"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Kombinera sidor (omvänt)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Omvänt"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Behåll oförändrad"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -558,16 +509,16 @@ msgstr ""
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Om Enkel bildläsning"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktyg för att skanna dokument"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -585,22 +536,22 @@ msgstr ""
 "deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Spara dokument innan du avslutar?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Du verkar ha en bildläsare från Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -609,12 +560,12 @@ msgstr ""
 "webbplats</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Du verkar ha en bildläsare från Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -623,17 +574,17 @@ msgstr ""
 "webbplats</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Du verkar ha en bildläsare från HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Du verkar ha en bildläsare från Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -642,109 +593,110 @@ msgstr ""
 "webbplats</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Installera drivrutiner"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Efter installation kan du behöva starta om Enkel bildläsning."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Installerar drivrutiner…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Drivrutinerna installerades!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Kunde inte installera drivrutiner (felkod %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Kunde inte installera drivrutiner."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Du behöver installera paketet %s."
 msgstr[1] "Du behöver installera paketen %s."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "E-post"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Ändra sidordning"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Tangentbordsgenvägar"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Hjälp"
 
-#: 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:1548
 msgid "Start Again…"
 msgstr "Starta igen…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotera sidan åt vänster (motsols)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotera sidan åt höger (medsols)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Beskär den valda sidan"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Radera den valda sidan"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "A_uktorisera"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "_Användarnamn för källa:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Lösenord:"
 
@@ -839,146 +791,146 @@ msgid "Copy current page to clipboard"
 msgstr "Kopiera aktuell sida till urklipp"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Bildläsare"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Inläsningssida"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Sidstorlek"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Framsida"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Baksida"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Båda"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Fördröjning"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Flera sidor från flatbädd"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Sekunder"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Skanna"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Textupplösning"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Fotoupplösning"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Ljusstyrka"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Kontrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Kvalitet"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Mörkare"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Ljusare"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Lägre"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Högre"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, 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:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hög upplösning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -994,12 +946,12 @@ msgid "Unable to connect to scanner"
 msgstr "Kan inte ansluta till bildläsare"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Kan inte starta bildläsare"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Fel i kommunikation med bildläsare"
 
@@ -1018,27 +970,57 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Laga PDF-filer som skapades med äldre versioner av Enkel bildläsning"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Misslyckades med att skanna"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Inläsning pågår"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[ENHET…] — Bildläsarverktyg"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Kör ”%s --help” för en komplett lista över tillgängliga kommandoradsflaggor."
 
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "_Document"
+#~ msgstr "_Dokument"
+
+#~ msgid "Sc_an"
+#~ msgstr "Skann_a"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Stoppa skanning"
+
+#~ msgid "_Email"
+#~ msgstr "_E-post"
+
+#~ msgid "_Page"
+#~ msgstr "_Sida"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjälp"
+
+#~ msgid "_Contents"
+#~ msgstr "_Innehåll"
+
+#~ msgid "Save"
+#~ msgstr "Spara"
+
+#~ msgid "About"
+#~ msgstr "Om"
+
 #~ msgid "Quit"
 #~ msgstr "Avsluta"
 
diff --git a/po/tr.po b/po/tr.po
index 671a6d6..105b283 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,23 +1,23 @@
 # Turkish translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# Emin Tufan Çetin <etcetin@gmail.com>, 2017.
 # Muhammet Kara <muhammetk@gnome.org>, 2017, 2018.
+# Emin Tufan Çetin <etcetin@gmail.com>, 2017-2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-07-01 04:06+0000\n"
-"PO-Revision-Date: 2018-08-06 10:24+0300\n"
-"Last-Translator: Muhammet Kara <muhammetk@gnome.org>\n"
-"Language-Team: Turkish <gnome-turk@gnome.org>\n"
+"POT-Creation-Date: 2019-02-07 20:31+0000\n"
+"PO-Revision-Date: 2019-02-08 12:27+0200\n"
+"Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
+"Language-Team: Türkçe <gnome-turk@gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.0.6\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -139,7 +139,7 @@ msgstr "Sayfalar arasındaki gecikmenin milisaniye türünden değeri."
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Basit Tarama"
 
@@ -178,207 +178,152 @@ msgstr "tara;tarayıcı;flatbed;düz yatak;adf;"
 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 "Tek _Sayfa"
-
-#. 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 "_Kaynaktaki Tüm Sayfalar"
-
-#. 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 "Düz Yataktan _Çoklu Sayfa"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "Metin"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "Fotoğraf"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "_Belge"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "T_ara"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "_Taramayı Durdur"
-
-#. 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 "Sayfaları Yeniden Sırala"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "_E-posta"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "_Sayfa"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "_Sola Döndür"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Sa_ğa Döndür"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Kırp"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Hiçbiri"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Harf"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Ya_sal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Özel"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Kırpmayı Döndür"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Sola Taşı"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "_Yardım"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "_İçindekiler"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Durdur"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "Tarayıcıdan tek bir sayfa tara"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Geçerli taramayı durdur"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "Tara"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "Tarayıcıdan tek bir sayfa tara"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Belgeyi bir dosyaya kaydet"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "Kaydet"
+#: src/app-window.ui:405
+msgid "_Single Page"
+msgstr "_Tek Sayfa"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "Geçerli taramayı durdur"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "_Kaynaktaki Tüm Sayfalar"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "Durdur"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "Düz Yataktan _Çoklu Sayfa"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "Tarayıcılar aranıyor…"
+#: src/app-window.ui:498
+msgid "_Text"
+msgstr "_Metin"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "_Resim"
+
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "_Kapat"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "“%s” kaynağına erişmek için kullanıcı adı ve parola gerekiyor"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Tarayıcılar aranıyor…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "Taramaya hazır"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "Ek yazılım gerekiyor"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -387,150 +332,156 @@ msgstr ""
 "gerekir."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Tarayıcı bulunamadı"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lütfen tarayıcınızın bağlı ve açık olduğundan emin olun"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "Farklı Kaydet…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "_Vazgeç"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "_Kaydet"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Vazgeç"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Taranan Belge.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (çok sayfalı belge)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (sıkıştırılmış)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (kayıpsız)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP (sıkıştırılmış)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Dosya biçimi:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "Sıkıştırma:"
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "“%s” adında bir dosya zaten var.  Değiştirmek ister misiniz?"
 
 #. 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:468
 msgid "_Replace"
 msgstr "_Değiştir"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "Kaydediliyor"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Dosya kaydedilemedi"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Eğer kaydetmezseniz, değişiklikler kalıcı olarak kaybedilecek."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Geçerli belgeyi kaydet?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Değişiklikleri Geri Al"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "Tarayıcıyla iletişim kuruluyor…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Görüntü, ön izleme için kaydedilemiyor"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Görüntü ön izleme uygulaması açılamıyor"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Sayfaları Yeniden Sırala"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "Yüzleri birleştir"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "Yüzleri birleştir (ters)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "Tersine çevir"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Değiştirmeden bırak"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -559,16 +510,16 @@ msgstr ""
 "Eğer almadıysanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -597,22 +548,22 @@ msgstr ""
 "  Emin Tufan Çetin <etcetin@gmail.com>"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Çıkmadan önce belgeyi kaydet?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Bir Brother tarayıcınız olduğu görünüyor."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -621,12 +572,12 @@ msgstr ""
 "sitesinde</a> bulunabilir."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Bir Samsung tarayıcınız olduğu görünüyor."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -635,17 +586,17 @@ msgstr ""
 "sitesinde</a> bulunabilir."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Bir HP tarayıcınız olduğu görünüyor."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Bir Epson tarayıcınız olduğu görünüyor."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -654,108 +605,109 @@ msgstr ""
 "a> bulunabilir."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Sürücüleri kur"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Yükledikten sonra Basit Taramaʼyı yeniden başlatmanız gerekiyor."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "Sürücüler kuruluyor…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Sürücüler başarıyla kuruldu!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Sürücülerin kurulumu başarısız oldu (hata kodu %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Sürücülerin kurulumu başarısız oldu."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "%s paket kurmanız gerekiyor."
 
-#: src/app-window.vala:1585
+#: src/app-window.vala:1533
 msgid "Email"
 msgstr "E-posta"
 
+#: src/app-window.vala:1534
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Sayfaları Yeniden Sırala"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1589 src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: src/app-window.vala:1590
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "Klavye Kısayolları"
 
-#: src/app-window.vala:1591
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "Yardım"
 
-#: src/app-window.vala:1592
-msgid "About"
-msgstr "Hakkında"
-
 #. 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:1548
 msgid "Start Again…"
 msgstr "Yeniden Başlat…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Sayfayı sola döndür (saat yönünün tersine)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1624
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Sayfayı sağa döndür (saat yönünde)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "Seçili sayfayı kırp"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1650
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "Seçili sayfayı sil"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1815
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "Vazgeç"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "_Yetkilendir"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "Kaynak için _kullanıcı adı:"
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "_Parola:"
 
@@ -850,146 +802,146 @@ msgid "Copy current page to clipboard"
 msgstr "Geçerli sayfayı panoya kopyala"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "_Tarayıcı"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "Tarama Yüzleri"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "Sayfa Boyutu"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "Ön"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "Arka"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "Her İkisi"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "Gecikme"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "Düz yataktan çoklu sayfa"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "Saniye"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "Tarama"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "_Metin Çözünürlüğü"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "_Fotoğraf Çözünürlüğü"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "Parlaklık"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "Karşıtlık"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "Nitelik"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Kendiliğinden"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "Daha koyu"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "Daha açık"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "Daha az"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "Daha çok"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (öntanımlı)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (yüksek çözünürlük)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -1005,12 +957,12 @@ msgid "Unable to connect to scanner"
 msgstr "Tarayıcıya bağlanılamadı"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "Tarama başlatılamadı"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "Tarayıcı ile iletişim kurulamıyor"
 
@@ -1029,28 +981,58 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Basit Taramaʼnın eski sürümlerince üretilen PDF dosyalarını düzelt"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "Tarama başarısız oldu"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "Tarama sürüyor"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[AYGIT…] — Tarama uygulaması"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
 "Kullanılabilir komut satırı seçeneklerinin tam listesini görmek için “%s --"
 "help” komutunu çalıştırın."
 
+#~ msgid "Photo"
+#~ msgstr "Fotoğraf"
+
+#~ msgid "_Document"
+#~ msgstr "_Belge"
+
+#~ msgid "Sc_an"
+#~ msgstr "T_ara"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "_Taramayı Durdur"
+
+#~ msgid "_Email"
+#~ msgstr "_E-posta"
+
+#~ msgid "_Page"
+#~ msgstr "_Sayfa"
+
+#~ msgid "_Help"
+#~ msgstr "_Yardım"
+
+#~ msgid "_Contents"
+#~ msgstr "_İçindekiler"
+
+#~ msgid "Save"
+#~ msgstr "Kaydet"
+
+#~ msgid "About"
+#~ msgstr "Hakkında"
+
 #~ msgid "Quit"
 #~ msgstr "Çık"
 
diff --git a/po/uk.po b/po/uk.po
index aa96b20..48a0fb7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,548 +2,495 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 #
-# Yuri Chornoivan <yurchor@gmail.com>, 2009.
+# Yuri Chornoivan <yurchor@gmail.com>, 2009, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-04-16 08:54-0400\n"
-"PO-Revision-Date: 2012-07-23 11:28+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
+"POT-Creation-Date: 2019-02-07 01:56+0000\n"
+"PO-Revision-Date: 2019-02-12 23:48+0200\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Launchpad (build 18361)\n"
+"X-Generator: Lokalize 19.03.70\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#. Button to submit authorization dialog
-#: src/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Уповноваження"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Пристрій сканування"
 
-#. Label beside username entry
-#: src/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Користувач ресурсу:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Пристрій SANE, з якого слід отримувати зображення."
 
-#. Label beside password entry
-#: src/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Пароль:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Тип документа, який ви скануєте"
 
-#. Combo box label for scanning both sides of a page
-#: src/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Передній і зворотний боки"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Тип документа, який сканується. За значенням цього параметра визначається "
+"роздільна здатність сканування, кольори та способи остаточної обробки."
 
-#. Combo box label for scanning the front side of a page
-#: src/simple-scan.ui:192
-msgid "Front"
-msgstr "Передній бік"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Ширина паперу у десятих міліметра"
 
-#. Combo box label for scanning the back side of a page
-#: src/simple-scan.ui:196
-msgid "Back"
-msgstr "Зворот"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Ширина паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Висота паперу у десятих міліметра"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Висота паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Яскравість сканування"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Коригування яскравості від -100 до 100 (0 — не коригувати)"
 
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Контрастність сканування"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Коригування контрастності від -100 до 100 (0 — не коригувати)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Роздільна здатність для сканування тексту"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Роздільна здатність у точках на дюйм для сканування тексту."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Роздільна здатність для сканування фотографій"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Роздільна здатність у точках на дюйм для сканування фотографій."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Бік сторінки, який слід сканувати"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Бік сторінки, який буде скановано."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Каталог збережених файлів"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Каталог, до якого слід зберігати файли. Якщо не буде вказано, типовим "
+"вважатиметься каталог документів."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Значення якості, яке буде використано під час стискання JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Значення якості, яке буде використано під час стискання JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Затримка у мілісекундах між сторінками"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Затримка у мілісекундах між сторінками."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
-#: data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "Просте сканування"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/simple-scan.ui:247
-msgid "_Document"
-msgstr "Д_окумент"
-
-#. Scan menu item
-#: src/simple-scan.ui:266
-msgid "Sc_an"
-msgstr "С_канування"
-
-#. Scan menu item to scan a single page from the scanner
-#. Toolbar scan menu item to scan a single page from the scanner
-#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
-msgid "Single _Page"
-msgstr "Одинарна _сторінка"
-
-#. Scan menu item to scan all pages from a document feeder
-#. Toolbar scan menu item to scan all pages from a document feeder
-#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
-msgid "All Pages From _Feeder"
-msgstr "Всі сторінки з _лотка"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Сканувати документи"
 
-#. Scan menu item to scan continuously from the flatbed
-#. Toolbar scan menu item to scan continuously from the flatbed
-#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
-msgid "_Multiple Pages From Flatbed"
+#: 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 ""
+"Програма для спрощення сканування документів та фотографій. За її допомогою "
+"ви зможете обрізати непотрібні частини сканованої фотографії та обернути її "
+"так, як потрібно. Передбачено можливості друку сканованих зображень, "
+"експортування даних до PDF та зберігання даних у файлах зображень "
+"різноманітних форматів."
 
-#. Menu entry to stop current scan
-#: src/simple-scan.ui:310
-msgid "_Stop Scan"
-msgstr "П_рипинити сканування"
-
-#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
-msgid "Text"
-msgstr "Текстовий"
-
-#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
-msgid "Photo"
-msgstr "Фотографія"
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Для роботи із більшістю сканерів у Simple Scan використовуються бібліотеки "
+"SANE."
 
-#. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
-msgid "Reorder Pages"
-msgstr "Перевпорядкувати сторінки"
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Засіб для сканування документів"
 
-#. Label on email menu item
-#: src/simple-scan.ui:371
-msgid "_Email"
-msgstr "_Надіслати ел. поштою"
+#. 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
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"scan;scanner;flatbed;adf;сканування;сканер;планшет;двобічне;автоматичне;"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/simple-scan.ui:436
-msgid "_Page"
-msgstr "С_торінка"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/simple-scan.ui:446
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "Обернути _ліворуч"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/simple-scan.ui:456
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "Обернути п_раворуч"
 
 #. Label for page crop submenu
-#: src/simple-scan.ui:466
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "_Обрізати"
 
 #. Radio button for no crop
-#: src/simple-scan.ui:476
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "_Без обрізання"
 
 #. Radio button for cropping page to A4 size
-#: src/simple-scan.ui:487
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/simple-scan.ui:498
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/simple-scan.ui:509
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/simple-scan.ui:520
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: src/simple-scan.ui:531
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/simple-scan.ui:542
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
+#. Radio button for cropping page to A3
+#: src/app-window.ui:106
+#| msgid "A_4"
+msgid "A_3"
+msgstr "A_3"
+
 #. Radio button for cropping to custom page size
-#: src/simple-scan.ui:553
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "_Нетипові"
 
 #. Menu item to rotate the crop area
-#: src/simple-scan.ui:571
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "_Обернути область обрізання"
 
 #. Menu item to move the selected page to the left
-#: src/simple-scan.ui:584
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "Пересунути ліворуч"
 
 #. Menu item to move the selected page to the right
-#: src/simple-scan.ui:593
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "Пересунути праворуч"
 
-#. Label on help menu
-#: src/simple-scan.ui:630
-msgid "_Help"
-msgstr "_Довідка"
-
-#. Help|Contents menu
-#: src/simple-scan.ui:638
-msgid "_Contents"
-msgstr "_Вміст"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "Зупинити"
 
-#. Tooltip for new document button
-#: src/simple-scan.ui:680 src/simple-scan.ui:891
-msgid "Start a new document"
-msgstr "Почати новий документ"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "Припинити поточне сканування"
 
-#: src/simple-scan.ui:681
-msgid "New"
-msgstr "Створити"
+#. Label on scan toolbar item
+#: src/app-window.ui:285
+msgid "Scan"
+msgstr "Сканувати"
 
 #. Tooltip for scan toolbar button
-#: src/simple-scan.ui:695 src/simple-scan.ui:842
+#: src/app-window.ui:288
 msgid "Scan a single page from the scanner"
 msgstr "Сканувати одну сторінку"
 
-#. Label on scan toolbar item
-#: src/simple-scan.ui:697 src/simple-scan.ui:843
-msgid "Scan"
-msgstr "Сканувати"
-
 #. Tooltip for save toolbar button
-#: src/simple-scan.ui:713 src/simple-scan.ui:870
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "Зберегти документ до файла"
 
-#: src/simple-scan.ui:715 src/ui.vala:1892
-msgid "Save"
-msgstr "Зберегти"
-
-#. Tooltip for stop button
-#: src/simple-scan.ui:730 src/simple-scan.ui:830
-msgid "Stop the current scan"
-msgstr "Припинити поточне сканування"
-
-#: src/simple-scan.ui:731 src/simple-scan.ui:831
-msgid "Stop"
-msgstr "Зупинити"
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: src/simple-scan.ui:755 src/simple-scan.ui:942
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Обертати сторінку ліворуч (проти годинникової стрілки)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: src/simple-scan.ui:756
-msgid "Rotate Left"
-msgstr "Обернути ліворуч"
-
-#. Tooltip for rotate right (clockwise) button
-#: src/simple-scan.ui:770 src/simple-scan.ui:920
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Обертати сторінку праворуч (за годинниковою стрілкою)"
-
-#. Label on rotate page right (clockwise) item
-#: src/simple-scan.ui:771
-msgid "Rotate Right"
-msgstr "Обернути праворуч"
-
-#: src/simple-scan.ui:785 src/simple-scan.ui:969
-msgid "Crop the selected page"
-msgstr "Обрізати позначену сторінку"
-
-#: src/simple-scan.ui:787
-msgid "Crop"
-msgstr "Обрізати"
-
-#. Title of preferences dialog
-#: src/simple-scan.ui:1003 src/ui.vala:1898
-msgid "Preferences"
-msgstr "Налаштування"
-
-#. Label beside scan source combo box
-#: src/simple-scan.ui:1054
-msgid "Scan S_ource:"
-msgstr "_Джерело даних сканування:"
-
-#. Label beside scan source combo box
-#: src/simple-scan.ui:1085
-msgid "_Text Resolution:"
-msgstr "Роздільна здатність _тексту:"
-
-#. Label beside scan source combo box
-#: src/simple-scan.ui:1101
-msgid "_Photo Resolution:"
-msgstr "Роздільна здатність _фотографій:"
-
-#. Label beside scan side combo box
-#: src/simple-scan.ui:1145
-msgid "Scan Side:"
-msgstr "Бік сканування:"
-
-#. Label beside page size combo box
-#: src/simple-scan.ui:1175
-msgid "Page Size:"
-msgstr "Розмір сторінки:"
+#: src/app-window.ui:405
+#| msgid "Single _Page"
+msgid "_Single Page"
+msgstr "О_динарна сторінка"
 
-#. Label beside brightness scale
-#: src/simple-scan.ui:1205
-msgid "Brightness:"
-msgstr "Яскравість:"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "Всі сторінки з _лотка"
 
-#. Label beside contrast scale
-#: src/simple-scan.ui:1235
-msgid "Contrast:"
-msgstr "Контрастність:"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Декілька сторінок із планшета"
 
-#. Label beside quality scale
-#: src/simple-scan.ui:1266
-msgid "Quality:"
-msgstr "Якість:"
+#: src/app-window.ui:498
+#| msgid "Text"
+msgid "_Text"
+msgstr "_Текст"
 
-#. Label beside page delay scale
-#: src/simple-scan.ui:1297
-msgid "Delay between pages:"
-msgstr ""
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "З_ображення"
 
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Засіб для сканування документів"
+#: src/app-window.vala:223 src/app-window.vala:1352
+msgid "_Close"
+msgstr "За_крити"
 
-#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
-msgid "Scan Documents"
-msgstr "Сканувати документи"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:232
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Для доступу до «%s» слід вказати ім’я користувача та пароль"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-"scan;scanner;flatbed;adf;сканування;сканер;планшет;двобічне;автоматичне;"
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "Шукаємо сканери…"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:254
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Готовність до сканування"
 
-#: 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 ""
-"Програма для спрощення сканування документів та фотографій. За її допомогою "
-"ви зможете обрізати непотрібні частини сканованої фотографії та обернути її "
-"так, як потрібно. Передбачено можливості друку сканованих зображень, "
-"експортування даних до PDF та зберігання даних у файлах зображень "
-"різноманітних форматів."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:261
+msgid "Additional software needed"
+msgstr "Потрібне додаткове програмне забезпечення"
 
-#: data/simple-scan.appdata.xml.in:14
+#. Instructions to install driver software
+#: src/app-window.vala:263
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Для роботи із більшістю сканерів у Simple Scan використовуються бібліотеки "
-"SANE."
-
-#. Error displayed when no scanners to scan with
-#: src/scanner.vala:844
-msgid "No scanners available.  Please connect a scanner."
-msgstr ""
-"Не вдалося виявити жодного сканера. Будь ласка, з’єднайте сканер з "
-"комп’ютером."
-
-#. Error displayed when cannot connect to scanner
-#: src/scanner.vala:874
-msgid "Unable to connect to scanner"
-msgstr "Не вдалося з’єднатися зі сканером"
-
-#. Error display when unable to start scan
-#: src/scanner.vala:1227
-msgid "Unable to start scan"
-msgstr "Не вдалося розпочати сканування"
-
-#. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1340
-msgid "Error communicating with scanner"
-msgstr "Помилка під час спроби обміну даними зі сканером"
-
-#. Help string for command line --version flag
-#: src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "Показати версію випуску"
-
-#. Help string for command line --debug flag
-#: src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Показувати діагностичні повідомлення"
-
-#: src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr ""
-"Виправити файли PDF, створені за допомогою застарілих версій Simple Scan"
-
-#. Title of error dialog when scan failed
-#: src/simple-scan.vala:389
-msgid "Failed to scan"
-msgstr "Помилка сканування"
-
-#. Arguments and description for --help text
-#: src/simple-scan.vala:619
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ПРИСТРІЙ...] — програма для сканування"
-
-#. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:630
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Виконайте « %s --help», щоб побачити повний перелік доступних параметрів "
-"командного рядка."
-
-#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
-msgid "_Close"
-msgstr "За_крити"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: src/ui.vala:341
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Для доступу до «%s» слід вказати ім’я користувача та пароль"
+"Вам слід <a href=\"install-firmware\">встановити драйвер</a> до вашого"
+" сканера."
 
 #. Warning displayed when no scanners are detected
-#: src/ui.vala:389
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "Сканерів не виявлено"
 
 #. Hint to user on why there are no scanners detected
-#: src/ui.vala:391
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/ui.vala:396
-msgid "Additional software needed"
-msgstr "Потрібне додаткове програмне забезпечення"
-
-#. Instructions to install driver software
-#: src/ui.vala:398
-msgid "You need to install driver software for your scanner."
-msgstr "Вам слід встановити драйвер до вашого сканера."
-
 #. Save dialog: Dialog title
-#: src/ui.vala:510
-msgid "Save As..."
-msgstr "Зберегти як..."
-
-#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
-msgid "_Cancel"
-msgstr "_Скасувати"
+#: src/app-window.vala:294
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Зберегти як…"
 
-#: src/ui.vala:514 src/ui.vala:724
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "З_берегти"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "_Скасувати"
+
 #. Default filename to use when saving document
-#: src/ui.vala:522
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "Сканований документ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: src/ui.vala:528
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "Файли зображень"
 
 #. Save dialog: Filter name to show all files
-#: src/ui.vala:534
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "Всі файли"
 
 #. Save dialog: Label for saving in PDF format
-#: src/ui.vala:543
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF (багатосторінковий документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/ui.vala:549
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG (стиснений)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/ui.vala:555
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG (без втрат)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: src/ui.vala:564
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:349
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (стиснений)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "Формат файлів:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:371
+msgid "Compression:"
+msgstr "Стискання:"
+
 #. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
-#: src/ui.vala:647
+#: src/app-window.vala:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr ""
+msgstr "Файл із назвою «%s» вже існує. Хочете його замінити?"
 
 #. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
-#: src/ui.vala:650
+#: src/app-window.vala:468
 msgid "_Replace"
-msgstr ""
+msgstr "За_мінити"
+
+#: src/app-window.vala:507
+msgid "Saving"
+msgstr "Зберігаємо"
 
 #. Title of error dialog when save failed
-#: src/ui.vala:698
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "Не вдалося зберегти файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/ui.vala:721
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:545
+#| msgid "If you don't save, changes will be permanently lost."
+msgid "If you don’t save, changes will be permanently lost."
 msgstr "Якщо ви не збережете внесені зміни, їх буде втрачено остаточно."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/ui.vala:763
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "Зберегти поточний документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/ui.vala:765
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "Відкинути зміни"
 
+#. Label shown when scan started
+#: src/app-window.vala:716
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Встановлюємо зв'язок зі сканером…"
+
 #. Error message display when unable to save image for preview
-#: src/ui.vala:1056
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "Не вдалося зберегти зображення для попереднього перегляду"
 
 #. Error message display when unable to preview image
-#: src/ui.vala:1068
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "Не вдалося запустити програму для перегляду зображення"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+#| msgid "Reorder Pages"
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "Перевпорядковування сторінок"
+
 #. Label on button for combining sides in reordering dialog
-#: src/ui.vala:1270
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "З’єднувати збоку"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/ui.vala:1280
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "З’єднувати збоку (у зворотному порядку)"
 
 #. Label on button for reversing in reordering dialog
-#: src/ui.vala:1290
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "У зворотному порядку"
 
 #. Label on button for cancelling page reordering dialog
-#: src/ui.vala:1300
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "Не змінювати"
 
 #. Error message displayed when unable to launch help browser
-#: src/ui.vala:1504
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
 #. The license this software is under (GPL3+)
-#: src/ui.vala:1525
+#: src/app-window.vala:1255
 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"
@@ -558,8 +505,8 @@ 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 ""
-"Ця програма є вільним програмним забезпеченням; ви можете поширювати її "
-"і/або змінювати її за умов дотримання GNU General Public License у тому "
+"Ця програма є вільним програмним забезпеченням; ви можете поширювати її і/"
+"або змінювати її за умов дотримання GNU General Public License у тому "
 "вигляді, у якому її оприлюднено Free Software Foundation; версії 3 цієї "
 "ліцензії, або (за потреби) будь-якої пізнішої версії.\n"
 "\n"
@@ -568,20 +515,20 @@ msgstr ""
 "ПРИДАТНОСТІ ДЛЯ ЯКОЇСЬ МЕТИ.  Докладніше про це ви можете дізнатися з \n"
 "GNU General Public License.\n"
 "Разом з цією програмою ви маєте отримати копію GNU General Public License. "
-"Якщо ви її не отримали, зверніться за адресою "
-"<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
+"Якщо ви її не отримали, зверніться за адресою <http://www.gnu.org/licenses/"
+">, щоб дізнатися про подальші дії."
 
 #. Title of about dialog
-#: src/ui.vala:1528
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
 #. Description of program
-#: src/ui.vala:1531
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: src/ui.vala:1540
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -592,400 +539,500 @@ msgstr ""
 "  Микола Ткач https://launchpad.net/~stuartlittle1970"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/ui.vala:1562
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "Зберегти документ перед виходом?"
 
-#. Button in dialog to quit and discard unsaved document
-#: src/ui.vala:1564
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/ui.vala:1632
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "Здається, у вас сканер Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/ui.vala:1634
+#: src/app-window.vala:1331
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Драйвери можна отримати на <a href=\"http://support.brother.com\">сайті "
 "Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/ui.vala:1638
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "Здається, у вас сканер Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/ui.vala:1640
+#: src/app-window.vala:1337
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Драйвери до таких сканерів можна отримати з <a "
-"href=\"http://samsung.com/support\">сайта Samsung</a>."
+"Драйвери до таких сканерів можна отримати з <a href=\"http://samsung.com/"
+"support\">сайта Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/ui.vala:1644
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "Здається, у вас сканер HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/ui.vala:1649
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "Здається, у вас сканер Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/ui.vala:1651
+#: src/app-window.vala:1348
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Драйвери для цього доступні на <a href=\"http://support.epson.com\">Веб-"
 "сайті Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/ui.vala:1655
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "Встановлення драйверів"
 
 #. Message in driver install dialog
-#: src/ui.vala:1686
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Після встановлення драйверів, вам слід перезапустити Simple Scan."
 
 #. Label shown while installing drivers
-#: src/ui.vala:1698
-msgid "Installing drivers..."
+#: src/app-window.vala:1398
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
 msgstr "Встановлюємо драйвери…"
 
 #. Label shown once drivers successfully installed
-#: src/ui.vala:1706
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "Драйвери успішно встановлено!"
 
 #. Label shown if failed to install drivers
-#: src/ui.vala:1716
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Не вдалося встановити драйвери (код помилки %d)."
 
 #. Label shown if failed to install drivers
-#: src/ui.vala:1722
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "Не вдалося встановити драйвери."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/ui.vala:1729
+#: src/app-window.vala:1429
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Необхідно встановити пакунок(-и) %s."
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Вам слід встановити пакунки %s."
+msgstr[1] "Вам слід встановити пакунки %s."
+msgstr[2] "Вам слід встановити пакунки %s."
+msgstr[3] "Вам слід встановити пакунок %s."
+
+#: src/app-window.vala:1533
+#| msgid "_Email"
+msgid "Email"
+msgstr "Надіслати ел. поштою"
+
+#: src/app-window.vala:1534
+#| msgid "Reorder Pages"
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "Перевпорядкувати сторінки"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: src/ui.vala:1833
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d т/д (типова)"
+#. Title of preferences dialog
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
+msgid "Preferences"
+msgstr "Налаштування"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: src/ui.vala:1836
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d т/д (чернетка)"
+#: src/app-window.vala:1538
+msgid "Keyboard Shortcuts"
+msgstr "Клавіатурні скорочення"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: src/ui.vala:1839
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d т/д (висока роздільність)"
+#: src/app-window.vala:1539
+msgid "Help"
+msgstr "Довідка"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/ui.vala:1842
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1548
+msgid "Start Again…"
+msgstr "Розпочати знову…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1567
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Обертати сторінку ліворуч (проти годинникової стрілки)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1576
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Обертати сторінку праворуч (за годинниковою стрілкою)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1588
+msgid "Crop the selected page"
+msgstr "Обрізати позначену сторінку"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1606
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Вилучити позначену сторінку"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1750
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Скасувати"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:22
+msgid "_Authorize"
+msgstr "_Уповноваження"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:80
+msgid "_Username for resource:"
+msgstr "_Користувач ресурсу:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:92
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d т/д"
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Не вдалося декодувати сторінку %i"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Сканування"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Сканувати одну сторінку"
 
-#: src/ui.vala:1885
-msgid "New Document"
-msgstr "Новий документ"
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Сканувати усі сторінки із лотка документів"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Сканувати неперервно із планшетного сканера"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Припинення поточного сканування"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Модифікація документа"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Пересунути сторінку ліворуч"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Пересунути сторінку праворуч"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Обертати сторінку ліворуч (проти годинникової стрілки)"
 
-#: src/ui.vala:1890
-msgid "Document"
-msgstr "Документ"
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Обертати сторінку праворуч (за годинниковою стрілкою)"
 
-#: src/ui.vala:1893
-msgid "Email..."
-msgstr "Надіслати ел. поштою…"
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr ""
+"Вилучити сторінки\n"
+"вилучення сторінок"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Керування документами"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Почати новий документ"
 
-#: src/ui.vala:1894
-msgid "Print..."
-msgstr "Надрукувати…"
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Зберегти сканований документ"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Надіслати поштою сканований документ"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Надрукувати сканований документ"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Копіювати поточну сторінку до буфера обміну"
 
-#: src/ui.vala:1902
-msgid "Help"
-msgstr "Довідка"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:80
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Сканер"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:108
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Боки сканування"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:124
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Розмір сторінки"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:153
+msgid "Front"
+msgstr "Передній бік"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:163
+msgid "Back"
+msgstr "Зворот"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:173
+msgid "Both"
+msgstr "Обидва"
 
-#: src/ui.vala:1903
-msgid "About"
-msgstr "Про програму"
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:200
+msgid "Delay"
+msgstr "Затримка"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:215
+msgid "Multiple pages from flatbed"
+msgstr "Декілька сторінок із планшета"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:233
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:243
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:254
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:265
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:276
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:297
+msgid "Seconds"
+msgstr "секунд"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:319
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Сканування"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:339
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "Роздільна здатність _тексту"
 
-#: src/ui.vala:1904
-msgid "Quit"
-msgstr "Вийти"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:354
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "Роздільна здатність _фотографій"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: src/ui.vala:1937
-msgid "Change _Scanner"
-msgstr "З_мінити сканер"
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:398
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Яскравість"
 
-#. Button in error infobar to prompt user to install drivers
-#: src/ui.vala:1939
-msgid "_Install Drivers"
-msgstr "_Встановити драйвери"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:413
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Контрастність"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:461
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Якість"
 
 #. Combo box value for automatic paper size
-#: src/ui.vala:1945
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/ui.vala:1995
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "темніше"
 
-#: src/ui.vala:1997
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "світліше"
 
-#: src/ui.vala:2005
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "менше"
 
-#: src/ui.vala:2007
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "більше"
 
-#: src/ui.vala:2015
-msgid "Minimum"
-msgstr "Мінімальна"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:437
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d т/д (типова)"
 
-#: src/ui.vala:2017
-msgid "Maximum"
-msgstr "Максимальна"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d т/д (чернетка)"
 
-#: src/ui.vala:2068
-msgid "Saving document..."
-msgstr "Збереження документа…"
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d т/д (висока роздільність)"
 
-#: src/ui.vala:2242
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:446
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Зберігаємо сторінку %d з %d"
+msgid "%d dpi"
+msgstr "%d т/д"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+"Не вдалося виявити жодного сканера. Будь ласка, з’єднайте сканер з "
+"комп’ютером."
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Користування:\n"
-#~ "  %s [ПРИСТРІЙ...] — інструмент сканування"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Не вдалося з’єднатися зі сканером"
 
-#, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "Параметри GTK+:\n"
-#~ "  --class=КЛАС                    Клас програми, який використовуватиметься "
-#~ "інструментом керування вікнами\n"
-#~ "  --name=НАЗВА                    Назва програми, що використовуватиметься "
-#~ "інструментом керування вікнами\n"
-#~ "  --screen=ЕКРАН                  Екран сервера X, яким слід скористатися\n"
-#~ "  --sync                          Синхронізувати виклики X\n"
-#~ "  --gtk-module=МОДУЛІ             Завантажити додаткові модулі GTK+\n"
-#~ "  --g-fatal-warnings              Завершувати роботу у разі появи попереджень"
-
-#~ msgid "Files missing"
-#~ msgstr "Не виявлено таких файлів"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Будь ласка, перевірте, чи належним чином встановлено програму"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Пристрій сканування"
-
-#~ msgid "Direction of scan"
-#~ msgstr "Напрямок сканування"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Пристрій SANE, з якого слід отримувати зображення."
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "Якщо позначено, вікно програми буде максимізовано"
-
-#~ 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 ""
-#~ "Напрямок сканування сторінки. Може мати такі значення: «top-to-bottom» "
-#~ "(згори вниз), «bottom-to-top» (знизу вгору), «left-to-right» (зліва "
-#~ "праворуч), «right-to-left» (справа ліворуч)"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Тип документа, який ви скануєте"
-
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Тип документа, який ви скануєте. «text» — текстовий документ, «photo» — "
-#~ "фотографії. Значення цього параметра впливає на роздільну здатність "
-#~ "сканування, використання кольорів та остаточну обробку зображення."
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Висота вікна у пікселях"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Ширина вікна у пікселях"
+#. Error display when unable to start scan
+#: src/scanner.vala:1251
+msgid "Unable to start scan"
+msgstr "Не вдалося розпочати сканування"
 
-#, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Додаткові параметри:\n"
-#~ "  -d, --debug                     Виводити діагностичні повідомлення\n"
-#~ "  -v, --version                   Показати відомості щодо випуску\n"
-#~ "  -h, --help                      Показати довідку щодо параметрів\n"
-#~ "  --help-all                      Показати всі параметри\n"
-#~ "  --help-gtk                      Показати параметри GTK+"
-
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Висота сканованого зображення у пікселях"
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Висота сканованого зображення у пікселях. Це значення буде оновлено на те, "
-#~ "яке було використано для попереднього зображення."
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Ширина сканованого зображення у пікселях. Це значення буде оновлено на те, "
-#~ "яке було використано для попереднього зображення."
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Ширина сканованого зображення у пікселях"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Роздільна здатність для сканування фотографій"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Роздільна здатність для сканування тексту"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Каталог збережених файлів"
-
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr ""
-#~ "Роздільна здатність у точках на дюйм попереднього сканованого зображення."
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Роздільна здатність попереднього сканованого зображення"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Роздільна здатність у точках на дюйм для сканування тексту."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Роздільна здатність у точках на дюйм для сканування фотографій."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Каталог, до якого слід зберігати файли. Якщо не буде вказано, типовим "
-#~ "вважатиметься каталог документів."
-
-#~ msgid "Scanned Document"
-#~ msgstr "Сканований документ"
-
-#~ msgid "Select File _Type"
-#~ msgstr "Вибрати _тип файла"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Бік паперу,  який слід сканувати. Може мати такі значення: 'both' 'front' "
-#~ "'back'"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Бік сторінки, який слід сканувати"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Висота паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Висота паперу у десятих міліметра"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Ширина паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Ширина паперу у десятих міліметра"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Бік сторінки, який буде скановано."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Тип документа, який сканується. За значенням цього параметра визначається "
-#~ "роздільна здатність сканування, кольори та способи остаточної обробки."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Напрямок сканування на сканованій сторінці."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1264 src/scanner.vala:1371
+msgid "Error communicating with scanner"
+msgstr "Помилка під час спроби обміну даними зі сканером"
+
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Показати версію випуску"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Показувати діагностичні повідомлення"
 
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Коригування контрастності від -100 до 100 (0 — не коригувати)"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Виправити файли PDF, створені за допомогою застарілих версій Simple Scan"
 
-#~ msgid "Contrast of scan"
-#~ msgstr "Контрастність сканування"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:393
+msgid "Failed to scan"
+msgstr "Помилка сканування"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Коригування яскравості від -100 до 100 (0 — не коригувати)"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:408
+msgid "Scan in progress"
+msgstr "Виконуємо сканування"
 
-#~ msgid "Brightness of scan"
-#~ msgstr "Яскравість сканування"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:585
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ПРИСТРІЙ…] — програма для сканування"
 
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Значення якості, яке буде використано під час стискання JPEG."
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:596
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Щоб переглянути повний список можливих параметрів командного рядка, віддайте "
+"команду «%s --help»."
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Значення якості, яке буде використано під час стискання JPEG"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d90440c..0457dcb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,22 +1,23 @@
 # Chinese (Traditional) translation for simple-scan
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# pan93412 <pan93412@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2018-06-25 22:01+0000\n"
-"PO-Revision-Date: 2018-06-28 21:23+0800\n"
-"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
-"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"POT-Creation-Date: 2019-02-07 15:48+0000\n"
+"PO-Revision-Date: 2019-02-17 23:25+0800\n"
+"Last-Translator: pan93412 <pan93412@gmail.com>\n"
+"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Lokalize 18.12.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -127,7 +128,7 @@ msgstr "每頁之間的延遲毫秒數。"
 #. 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
+#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
 msgid "Simple Scan"
 msgstr "簡易掃描"
 
@@ -163,357 +164,311 @@ msgstr "scan;scanner;flatbed;adf;"
 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 "單一頁面(_P)"
-
-#. 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 "從饋紙器掃描所有頁面(_F)"
-
-#. 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 "從平臺多頁掃描(_M)"
-
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
-msgid "Text"
-msgstr "文字"
-
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
-msgid "Photo"
-msgstr "相片"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: src/app-window.ui:91
-msgid "_Document"
-msgstr "文件(_D)"
-
-#. Scan menu item
-#: src/app-window.ui:110
-msgid "Sc_an"
-msgstr "掃描(_A)"
-
-#. Menu entry to stop current scan
-#: src/app-window.ui:154
-msgid "_Stop Scan"
-msgstr "停止掃描(_S)"
-
-#. 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:1601
-msgid "Reorder Pages"
-msgstr "重新排列頁面"
-
-#. Label on email menu item
-#: src/app-window.ui:215
-msgid "_Email"
-msgstr "電子郵件(_E)"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: src/app-window.ui:280
-msgid "_Page"
-msgstr "頁面(_P)"
-
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:290
+#: src/app-window.ui:10
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:300
+#: src/app-window.ui:19
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: src/app-window.ui:310
+#: src/app-window.ui:28
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: src/app-window.ui:320
+#: src/app-window.ui:36
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:331
+#: src/app-window.ui:46
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:342
+#: src/app-window.ui:56
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:353
+#: src/app-window.ui:66
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:364
+#: src/app-window.ui:76
 msgid "_Letter"
 msgstr "美規信紙(_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:375
+#: src/app-window.ui:86
 msgid "Le_gal"
 msgstr "美規長信紙(Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:386
+#: src/app-window.ui:96
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:397
-#| msgid "A_4"
+#: src/app-window.ui:106
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:408
+#: src/app-window.ui:116
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:426
+#: src/app-window.ui:132
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:439
+#: src/app-window.ui:144
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:448
+#: src/app-window.ui:152
 msgid "Move Right"
 msgstr "右移"
 
-#. Label on help menu
-#: src/app-window.ui:485
-msgid "_Help"
-msgstr "幫助(_H)"
-
-#. Help|Contents menu
-#: src/app-window.ui:493
-msgid "_Contents"
-msgstr "內容(_C)"
+#: src/app-window.ui:272
+msgid "Stop"
+msgstr "停止"
 
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:531 src/app-window.ui:731
-msgid "Scan a single page from the scanner"
-msgstr "從掃描器掃描單一頁面"
+#. Tooltip for stop button
+#: src/app-window.ui:274
+msgid "Stop the current scan"
+msgstr "停止目前的掃描"
 
 #. Label on scan toolbar item
-#: src/app-window.ui:533 src/app-window.ui:727
+#: src/app-window.ui:285
 msgid "Scan"
 msgstr "掃描"
 
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:288
+msgid "Scan a single page from the scanner"
+msgstr "從掃描器掃描單一頁面"
+
 #. Tooltip for save toolbar button
-#: src/app-window.ui:549 src/app-window.ui:798
+#: src/app-window.ui:352
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: src/app-window.ui:551
-msgid "Save"
-msgstr "儲存"
+#: src/app-window.ui:405
+#| msgid "Single _Page"
+msgid "_Single Page"
+msgstr "單頁(_S)"
 
-#. Tooltip for stop button
-#: src/app-window.ui:566 src/app-window.ui:711
-msgid "Stop the current scan"
-msgstr "停止目前的掃描"
+#: src/app-window.ui:436
+msgid "All Pages From _Feeder"
+msgstr "從饋紙器掃描所有頁面(_F)"
 
-#: src/app-window.ui:567 src/app-window.ui:708
-msgid "Stop"
-msgstr "停止"
+#: src/app-window.ui:467
+msgid "_Multiple Pages From Flatbed"
+msgstr "從平臺多頁掃描(_M)"
 
-#. Label shown when searching for scanners
-#: src/app-window.ui:622
-msgid "Searching for Scanners…"
-msgstr "正在搜尋掃描器…"
+#: src/app-window.ui:498
+#| msgid "Text"
+msgid "_Text"
+msgstr "文字(_T)"
+
+#: src/app-window.ui:529
+msgid "_Image"
+msgstr "圖片(_I)"
 
-#: src/app-window.vala:239 src/app-window.vala:1391
+#: src/app-window.vala:223 src/app-window.vala:1352
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:248
+#: src/app-window.vala:232
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "若要存取「%s」則必須提供使用者名稱與密碼"
 
+#. Label shown when searching for scanners
+#: src/app-window.vala:248
+msgid "Searching for Scanners…"
+msgstr "正在搜尋掃描器…"
+
 #. Label shown when detected a scanner
-#: src/app-window.vala:268 src/app-window.vala:586
+#: src/app-window.vala:254
 msgid "Ready to Scan"
 msgstr "準備掃描"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:275
+#: src/app-window.vala:261
 msgid "Additional software needed"
 msgstr "需要額外軟體"
 
 #. Instructions to install driver software
-#: src/app-window.vala:277
+#: src/app-window.vala:263
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
 msgstr "您需要為您的掃描器<a href=\"install-firmware\">安裝驅動程式</a>。"
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:283
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "沒有偵測到掃描器"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:285
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:300
+#: src/app-window.vala:294
 msgid "Save As…"
 msgstr "另存為…"
 
-#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: src/app-window.vala:304 src/app-window.vala:555
+#: src/app-window.vala:297 src/app-window.vala:548
 msgid "_Save"
 msgstr "儲存(_S)"
 
+#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+msgid "_Cancel"
+msgstr "取消(_C)"
+
 #. Default filename to use when saving document
-#: src/app-window.vala:312
+#: src/app-window.vala:305
 msgid "Scanned Document.pdf"
 msgstr "掃描的文件.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:318
+#: src/app-window.vala:311
 msgid "Image Files"
 msgstr "影像檔"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:328
+#: src/app-window.vala:321
 msgid "All Files"
 msgstr "所有檔案"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:337
+#: src/app-window.vala:330
 msgid "PDF (multi-page document)"
 msgstr "PDF（多頁文件）"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:343
+#: src/app-window.vala:336
 msgid "JPEG (compressed)"
 msgstr "JPEG（壓縮）"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:349
+#: src/app-window.vala:342
 msgid "PNG (lossless)"
 msgstr "PNG（無損）"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:356
+#: src/app-window.vala:349
 msgid "WebP (compressed)"
 msgstr "WebP（壓縮）"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:366
+#: src/app-window.vala:359
 msgid "File format:"
 msgstr "檔案格式："
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:378
+#: src/app-window.vala:371
 msgid "Compression:"
 msgstr "壓縮："
 
 #. 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:465
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "「%s」檔名已經存在。您是否希望取代該檔案？"
 
 #. 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:468
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: src/app-window.vala:514
+#: src/app-window.vala:507
 msgid "Saving"
 msgstr "儲存"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:529
+#: src/app-window.vala:522
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:552
+#: src/app-window.vala:545
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "如果您不儲存，所做變更將會永遠失去。"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:593
+#: src/app-window.vala:581
 msgid "Save current document?"
 msgstr "是否儲存目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:595
+#: src/app-window.vala:583
 msgid "Discard Changes"
 msgstr "放棄變更"
 
 #. Label shown when scan started
-#: src/app-window.vala:694
+#: src/app-window.vala:716
 msgid "Contacting scanner…"
 msgstr "正在聯絡掃描器…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:804
+#: src/app-window.vala:799
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:816
+#: src/app-window.vala:811
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
+#. Title of dialog to reorder pages
+#: src/app-window.vala:973
+#| msgid "Reorder Pages"
+msgctxt "dialog title"
+msgid "Reorder Pages"
+msgstr "重新排列頁面"
+
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1001
+#: src/app-window.vala:996
 msgid "Combine sides"
 msgstr "合併邊緣"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1011
+#: src/app-window.vala:1006
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (相反次序)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1021
+#: src/app-window.vala:1016
 msgid "Reverse"
 msgstr "反轉"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1031
+#: src/app-window.vala:1026
 msgid "Keep unchanged"
 msgstr "維持不變"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1261
+#: src/app-window.vala:1240
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1282
+#: src/app-window.vala:1255
 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"
@@ -539,16 +494,16 @@ msgstr ""
 "www.gnu.org/licenses/>。"
 
 #. Title of about dialog
-#: src/app-window.vala:1285
+#: src/app-window.vala:1258 src/app-window.vala:1540
 msgid "About Simple Scan"
 msgstr "關於《簡易掃描》"
 
 #. Description of program
-#: src/app-window.vala:1288
+#: src/app-window.vala:1261
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: src/app-window.vala:1297
+#: src/app-window.vala:1270
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -562,22 +517,22 @@ msgstr ""
 "  tomoe_musashi https://launchpad.net/~musashi"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1319
+#: src/app-window.vala:1286
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1321
+#: src/app-window.vala:1288
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1368
+#: src/app-window.vala:1329
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一台 Brother 掃描器。"
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1370
+#: src/app-window.vala:1331
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -586,12 +541,12 @@ msgstr ""
 "\">Brother 網站</a>。"
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1335
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一台 Samsung 掃描器。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1337
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -600,17 +555,17 @@ msgstr ""
 "\">Samsung 網站</a>。"
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1380
+#: src/app-window.vala:1341
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一台 HP 掃描器。"
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1385
+#: src/app-window.vala:1346
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一台 Epson 掃描器。"
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1387
+#: src/app-window.vala:1348
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -619,113 +574,110 @@ msgstr ""
 "找到。"
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1391
+#: src/app-window.vala:1352
 msgid "Install drivers"
 msgstr "安裝驅動程式"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1385
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "一旦安裝，您將需要重新啟動簡易掃描。"
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1434
+#: src/app-window.vala:1398
 msgid "Installing drivers…"
 msgstr "正在安裝驅動程式..."
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1442
+#: src/app-window.vala:1406
 msgid "Drivers installed successfully!"
 msgstr "成功安裝驅動程式！"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1452
+#: src/app-window.vala:1416
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1458
+#: src/app-window.vala:1422
 msgid "Failed to install drivers."
 msgstr "驅動程式安裝失敗。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1465
+#: src/app-window.vala:1429
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "您得先安裝 %s 軟體包。"
 
+#: src/app-window.vala:1533
+msgid "Email"
+msgstr "電子郵件"
+
+#: src/app-window.vala:1534
+#| msgid "Reorder Pages"
+msgctxt "menu"
+msgid "Reorder Pages"
+msgstr "重新排列頁面"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1579 src/app-window.vala:1602
-#: src/preferences-dialog.ui:53
+#: src/app-window.vala:1537 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: src/app-window.vala:1583
+#: src/app-window.vala:1538
 msgid "Keyboard Shortcuts"
 msgstr "鍵盤捷徑鍵"
 
-#: src/app-window.vala:1584
+#: src/app-window.vala:1539
 msgid "Help"
 msgstr "求助"
 
-#: src/app-window.vala:1585
-msgid "About"
-msgstr "關於"
-
-#: src/app-window.vala:1586
-msgid "Quit"
-msgstr "結束"
-
-#: src/app-window.vala:1600
-msgid "Email"
-msgstr "電子郵件"
-
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1610
+#: src/app-window.vala:1548
 msgid "Start Again…"
 msgstr "再次開始…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1627
+#: src/app-window.vala:1567
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "將頁面向左旋轉 (逆時針方向)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1634
+#: src/app-window.vala:1576
 msgid "Rotate the page to the right (clockwise)"
 msgstr "將頁面向右旋轉 (順時針方向)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1644
+#: src/app-window.vala:1588
 msgid "Crop the selected page"
 msgstr "裁切所選的頁面"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1660
+#: src/app-window.vala:1606
 msgid "Delete the selected page"
 msgstr "刪除所選頁面"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1825
+#: src/app-window.vala:1750
 msgid "Cancel"
 msgstr "取消"
 
 #. Button to submit authorization dialog
-#: src/authorize-dialog.ui:25
+#: src/authorize-dialog.ui:22
 msgid "_Authorize"
 msgstr "授權(_A)"
 
 #. Label beside username entry
-#: src/authorize-dialog.ui:99
+#: src/authorize-dialog.ui:80
 msgid "_Username for resource:"
 msgstr "資源的使用者名稱(_U)："
 
 #. Label beside password entry
-#: src/authorize-dialog.ui:112
+#: src/authorize-dialog.ui:92
 msgid "_Password:"
 msgstr "密碼(_P)："
 
@@ -820,146 +772,146 @@ msgid "Copy current page to clipboard"
 msgstr "複製目前頁面到剪貼簿中"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:113
+#: src/preferences-dialog.ui:80
 msgid "_Scanner"
 msgstr "掃描器(_S)"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:143
+#: src/preferences-dialog.ui:108
 msgid "Scan Sides"
 msgstr "掃描面"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:160
+#: src/preferences-dialog.ui:124
 msgid "Page Size"
 msgstr "頁面大小"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:191
+#: src/preferences-dialog.ui:153
 msgid "Front"
 msgstr "正面"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:206
+#: src/preferences-dialog.ui:163
 msgid "Back"
 msgstr "背面"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:221
+#: src/preferences-dialog.ui:173
 msgid "Both"
 msgstr "雙面"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:260
+#: src/preferences-dialog.ui:200
 msgid "Delay"
 msgstr "延遲"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:215
 msgid "Multiple pages from flatbed"
 msgstr "從平臺多頁掃描"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:295
+#: src/preferences-dialog.ui:233
 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:243
 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:254
 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:265
 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:276
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:385
+#: src/preferences-dialog.ui:297
 msgid "Seconds"
 msgstr "秒"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:413
+#: src/preferences-dialog.ui:319
 msgid "Scanning"
 msgstr "掃描"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:436
+#: src/preferences-dialog.ui:339
 msgid "_Text Resolution"
 msgstr "文字解析度(_T)"
 
 #. Label beside scan source combo box
-#: src/preferences-dialog.ui:452
+#: src/preferences-dialog.ui:354
 msgid "_Photo Resolution"
 msgstr "相片解析度(_P)"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:505
+#: src/preferences-dialog.ui:398
 msgid "Brightness"
 msgstr "亮度"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:521
+#: src/preferences-dialog.ui:413
 msgid "Contrast"
 msgstr "對比"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:576
+#: src/preferences-dialog.ui:461
 msgid "Quality"
 msgstr "品質"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:72
 msgid "Automatic"
 msgstr "自動"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:113
 msgid "Darker"
 msgstr "較深"
 
-#: src/preferences-dialog.vala:120
+#: src/preferences-dialog.vala:115
 msgid "Lighter"
 msgstr "較淺"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:123
 msgid "Less"
 msgstr "少"
 
-#: src/preferences-dialog.vala:130
+#: src/preferences-dialog.vala:125
 msgid "More"
 msgstr "多"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:442
+#: src/preferences-dialog.vala:437
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:445
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:448
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解析度)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:451
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
@@ -975,12 +927,12 @@ msgid "Unable to connect to scanner"
 msgstr "無法連接到掃描器"
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1227
+#: src/scanner.vala:1251
 msgid "Unable to start scan"
 msgstr "無法起始掃描"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1347
+#: src/scanner.vala:1264 src/scanner.vala:1371
 msgid "Error communicating with scanner"
 msgstr "與掃描器溝通時發生錯誤"
 
@@ -999,26 +951,59 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "修正由舊版本簡易掃描產生的 PDF 檔案"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:392
+#: src/simple-scan.vala:393
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:407
+#: src/simple-scan.vala:408
 msgid "Scan in progress"
 msgstr "掃描進行中"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:584
+#: src/simple-scan.vala:585
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[裝置...] — 掃描公用程式"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:595
+#: src/simple-scan.vala:596
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
 
+#~ msgid "Photo"
+#~ msgstr "相片"
+
+#~ msgid "_Document"
+#~ msgstr "文件(_D)"
+
+#~ msgid "Sc_an"
+#~ msgstr "掃描(_A)"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "停止掃描(_S)"
+
+#~ msgid "_Email"
+#~ msgstr "電子郵件(_E)"
+
+#~ msgid "_Page"
+#~ msgstr "頁面(_P)"
+
+#~ msgid "_Help"
+#~ msgstr "幫助(_H)"
+
+#~ msgid "_Contents"
+#~ msgstr "內容(_C)"
+
+#~ msgid "Save"
+#~ msgstr "儲存"
+
+#~ msgid "About"
+#~ msgstr "關於"
+
+#~ msgid "Quit"
+#~ msgstr "結束"
+
 #~ msgid "Front and Back"
 #~ msgstr "正面與背面"
 
diff --git a/snap/classic-launch b/snap/classic-launch
deleted file mode 100755
index 96452d9..0000000
--- a/snap/classic-launch
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-if test "$1" = "classic"; then
-    shift
-    case $SNAP_ARCH in
-        amd64)
-            TRIPLET="x86_64-linux-gnu"
-            ;;
-        armhf)
-            TRIPLET="arm-linux-gnueabihf"
-            ;;
-        arm64)
-            TRIPLET="aarch64-linux-gnu"
-            ;;
-        *)
-            TRIPLET="$(uname -p)-linux-gnu"
-            ;;
-    esac
-
-    export LD_LIBRARY_PATH=$SNAP/usr/lib:$SNAP/usr/lib/$TRIPLET:$SNAP/lib/$TRIPLET
-fi
-
-exec ${SNAP}/bin/desktop-launch $@
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 14fa600..3e3d92d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -5,23 +5,73 @@ description: |
   Simple Scan allows you to get images from a scanner (e.g. a flatbed scanner)
 
 grade: stable # must be 'stable' to release into candidate/stable channels
-confinement: classic
+confinement: strict
+base: core18
 
+plugs:
+  gnome-3-28-1804:
+    interface: content
+    target: $SNAP/gnome-platform
+    default-provider: gnome-3-28-1804
+  gtk-3-themes:
+    interface: content
+    target: $SNAP/data-dir/themes
+    default-provider: gtk-common-themes
+  icon-themes:
+    interface: content
+    target: $SNAP/data-dir/icons
+    default-provider: gtk-common-themes
+  sound-themes:
+    interface: content
+    target: $SNAP/data-dir/sounds
+    default-provider: gtk-common-themes
+
+slots:
+  # for GtkApplication registration
+  simple-scan:
+    interface: dbus
+    bus: session
+    name: org.gnome.SimpleScan
+ 
 apps:
   simple-scan:
-    command: bin/classic-launch classic ${SNAP}/usr/bin/simple-scan
+    plugs:
+      - desktop
+      - desktop-legacy
+      - network
+      - network-control
+      - home
+      - gsettings
+      - hardware-observe
+      - mount-observe
+      - system-observe
+      - io-ports-control
+      - raw-usb
+      - unity7
+    command: bin/desktop-launch ${SNAP}/usr/bin/simple-scan
     desktop: usr/share/applications/simple-scan.desktop
     environment:
       GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
 
 parts:
+  desktop-gnome-platform:
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+    source-subdir: gtk
+    plugin: make
+    make-parameters: ["FLAVOR=gtk3"]
+    build-packages:
+      - build-essential
+      - libgtk-3-dev
+    override-build: |
+      snapcraftctl build
+      mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform
+
   libsane:
-    after: [desktop-gtk3]
-    source: https://anonscm.debian.org/cgit/sane/sane-backends.git
+    after: [desktop-gnome-platform]
+    source: https://salsa.debian.org/debian/sane-backends.git
     source-type: git
-    source-tag: RELEASE_1_0_27
+    source-tag: upstream/1.0.27
     plugin: autotools
-    # workaround the issue described in https://launchpad.net/bugs/1583250
     configflags: [--prefix=/snap/simple-scan/current/usr, --with-api-spec=no]
     organize:
       snap/simple-scan/current/usr: usr
@@ -47,13 +97,11 @@ parts:
   simple-scan:
     after: [libsane]
     source: .
+    source-type: git
     plugin: meson
     meson-parameters: [--prefix=/usr]
     organize:
       snap/simple-scan/current/usr: usr
-    install: |
-      mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp snapbuild/data/simple-scan.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/
     build-packages:
       - desktop-file-utils
       - gettext
@@ -72,8 +120,9 @@ parts:
       - python-scour
       - valac
       - zlib1g-dev
-  classic-launch:
-    plugin: dump
-    source: ./snap
-    organize:
-      classic-launch: bin/classic-launch
+  libs:
+    plugin: nil
+    stage-packages:
+      - libgusb2
+      - libpackagekit-glib2-18
+      - libieee1284-3
diff --git a/src/app-window.ui b/src/app-window.ui
index 6e13088..fbde173 100644
--- a/src/app-window.ui
+++ b/src/app-window.ui
@@ -2,624 +2,215 @@
 <!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
-  <object class="GtkImage" id="email_image">
+  <object class="GtkMenu" id="page_menu">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">mail-send</property>
-  </object>
-  <object class="GtkImage" id="help_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-help</property>
-  </object>
-  <object class="GtkMenu" id="scan_button_hb_menu">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="scan_single_button_hb_menuitem">
+      <object class="GtkMenuItem" id="rotate_left_menuitem">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
+        <property name="label" translatable="yes" comments="Menu item to rotate page to left (anti-clockwise)">Rotate _Left</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
+        <signal name="activate" handler="rotate_left_button_clicked_cb" swapped="no"/>
+        <accelerator key="bracketleft" signal="activate"/>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="scan_all_button_hb_menuitem">
+      <object class="GtkMenuItem" id="rotate_right_menuitem">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
+        <property name="label" translatable="yes" comments="Menu item to rotate page to right (clockwise)">Rotate _Right</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
+        <signal name="activate" handler="rotate_right_button_clicked_cb" swapped="no"/>
+        <accelerator key="bracketright" signal="activate"/>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="batch_button_hb_menuitem">
+      <object class="GtkMenuItem" id="crop_menuitem">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan continuously from the flatbed">_Multiple Pages From Flatbed</property>
+        <property name="label" translatable="yes" comments="Label for page crop submenu">_Crop</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="batch_button_clicked_cb" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="menuitem3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkRadioMenuItem" id="text_button_hb_menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Text</property>
-        <property name="use_underline">True</property>
-        <property name="draw_as_radio">True</property>
-        <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkRadioMenuItem" id="photo_button_hb_menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Photo</property>
-        <property name="use_underline">True</property>
-        <property name="active">True</property>
-        <property name="draw_as_radio">True</property>
-        <property name="group">text_button_hb_menuitem</property>
-        <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
-      </object>
-    </child>
-  </object>
-  <template class="AppWindow" parent="GtkApplicationWindow">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
-    <property name="icon_name">scanner</property>
-    <signal name="delete-event" handler="window_delete_event_cb" swapped="no"/>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkMenuBar" id="menubar">
-            <property name="can_focus">False</property>
+        <child type="submenu">
+          <object class="GtkMenu" id="crop_menu">
+            <property name="visible">True</property>
             <child>
-              <object class="GtkMenuItem" id="document_menuitem">
+              <object class="GtkRadioMenuItem" id="no_crop_menuitem">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" comments="Label on document menu (contains actions for this document, e.g. save, print)">_Document</property>
+                <property name="label" translatable="yes" comments="Radio button for no crop">_None</property>
                 <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="document_menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="new_menuitem">
-                        <property name="label">gtk-new</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="new_button_clicked_cb" swapped="no"/>
-                        <accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="scan_menuitem">
-                        <property name="label" translatable="yes" comments="Scan menu item">Sc_an</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <child type="submenu">
-                          <object class="GtkMenu" id="scan_menu">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkMenuItem" id="scan_single_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Scan menu item to scan a single page from the scanner">Single _Page</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
-                                <accelerator key="1" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkMenuItem" id="scan_all_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
-                                <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkMenuItem" id="batch_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Scan menu item to scan continuously from the flatbed">_Multiple Pages From Flatbed</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="batch_button_clicked_cb" swapped="no"/>
-                                <accelerator key="m" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkMenuItem" id="stop_scan_menuitem">
-                                <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Menu entry to stop current scan">_Stop Scan</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="stop_scan_button_clicked_cb" swapped="no"/>
-                                <accelerator key="Escape" signal="activate"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSeparatorMenuItem" id="menuitem2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="text_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Text</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="photo_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Photo</property>
-                                <property name="use_underline">True</property>
-                                <property name="active">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <property name="group">text_menuitem</property>
-                                <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="reorder_menuitem">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="Menu item to reorder pages">Reorder Pages</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="reorder_menuitem_activate_cb" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="save_menuitem">
-                        <property name="label">gtk-save</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="save_file_button_clicked_cb" swapped="no"/>
-                        <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="email_menuitem">
-                        <property name="label" translatable="yes" comments="Label on email menu item">_Email</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="image">email_image</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="email_button_clicked_cb" swapped="no"/>
-                        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="print_menuitem">
-                        <property name="label">gtk-print</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="print_button_clicked_cb" swapped="no"/>
-                        <accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" id="document_sep_menuitem">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="preferences_menuitem">
-                        <property name="label">gtk-preferences</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="preferences_button_clicked_cb" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="quit_menuitem">
-                        <property name="label">gtk-quit</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="quit_menuitem_activate_cb" swapped="no"/>
-                        <accelerator key="w" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="active">True</property>
+                <property name="draw_as_radio">True</property>
+                <signal name="toggled" handler="no_crop_menuitem_toggled_cb" swapped="no"/>
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="page_menuitem">
+              <object class="GtkRadioMenuItem" id="a4_menuitem">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" comments="Page menu (contains action for each page, e.g. delete, crop)">_Page</property>
+                <property name="label" translatable="yes" comments="Radio button for cropping page to A4 size">A_4</property>
                 <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="page_menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkMenuItem" id="rotate_left_menuitem">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="Menu item to rotate page to left (anti-clockwise)">Rotate _Left</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="rotate_left_button_clicked_cb" swapped="no"/>
-                        <accelerator key="bracketleft" signal="activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="rotate_right_menuitem">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="Menu item to rotate page to right (clockwise)">Rotate _Right</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="rotate_right_button_clicked_cb" swapped="no"/>
-                        <accelerator key="bracketright" signal="activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="crop_menuitem">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="Label for page crop submenu">_Crop</property>
-                        <property name="use_underline">True</property>
-                        <child type="submenu">
-                          <object class="GtkMenu" id="crop_menu">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="no_crop_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Radio button for no crop">_None</property>
-                                <property name="use_underline">True</property>
-                                <property name="active">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <signal name="toggled" handler="no_crop_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="a4_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Radio button for cropping page to A4 size">A_4</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="a4_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="a5_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Radio button for cropping page to A5 size">A_5</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="a5_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="a6_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Radio button for cropping page to A6 size">A_6</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="a6_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="letter_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Radio button for cropping page to US letter size">_Letter</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="letter_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="legal_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Radio button for cropping to page to US legal size">Le_gal</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="legal_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="four_by_six_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4×6</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="four_by_six_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="a3_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Radio button for cropping page to A3">A_3</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="a3_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkRadioMenuItem" id="custom_crop_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Radio button for cropping to custom page size">_Custom</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_as_radio">True</property>
-                                <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="custom_crop_menuitem_toggled_cb" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSeparatorMenuItem" id="crop_sep_menuitem">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkMenuItem" id="crop_rotate_menuitem">
-                                <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="Menu item to rotate the crop area">_Rotate Crop</property>
-                                <property name="use_underline">True</property>
-                                <signal name="activate" handler="crop_rotate_menuitem_activate_cb" swapped="no"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="page_move_left_menuitem">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="Menu item to move the selected page to the left">Move Left</property>
-                        <signal name="activate" handler="page_move_left_menuitem_activate_cb" swapped="no"/>
-                        <accelerator key="less" signal="activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="page_move_right_menuitem">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="Menu item to move the selected page to the right">Move Right</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="page_move_right_menuitem_activate_cb" swapped="no"/>
-                        <accelerator key="greater" signal="activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="copy_to_clipboard_menuitem">
-                        <property name="label">gtk-copy</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="copy_to_clipboard_button_clicked_cb" swapped="no"/>
-                        <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="page_delete_menuitem">
-                        <property name="label">gtk-delete</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="page_delete_menuitem_activate_cb" swapped="no"/>
-                        <accelerator key="Delete" signal="activate"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="draw_as_radio">True</property>
+                <property name="group">no_crop_menuitem</property>
+                <signal name="toggled" handler="a4_menuitem_toggled_cb" swapped="no"/>
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="help_menuitem">
+              <object class="GtkRadioMenuItem" id="a5_menuitem">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" comments="Label on help menu">_Help</property>
+                <property name="label" translatable="yes" comments="Radio button for cropping page to A5 size">A_5</property>
                 <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="help_menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="help_contents_menuitem">
-                        <property name="label" translatable="yes" comments="Help|Contents menu">_Contents</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="image">help_image</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" handler="help_contents_menuitem_activate_cb" swapped="no"/>
-                        <accelerator key="F1" signal="activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="about_menuitem">
-                        <property name="label">gtk-about</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="about_menuitem_activate_cb" swapped="no"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="draw_as_radio">True</property>
+                <property name="group">no_crop_menuitem</property>
+                <signal name="toggled" handler="a5_menuitem_toggled_cb" swapped="no"/>
               </object>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolbar" id="toolbar">
-            <property name="can_focus">False</property>
             <child>
-              <object class="GtkMenuToolButton" id="scan_toolbutton">
+              <object class="GtkRadioMenuItem" id="a6_menuitem">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar button">Scan a single page from the scanner</property>
-                <property name="is_important">True</property>
-                <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
+                <property name="label" translatable="yes" comments="Radio button for cropping page to A6 size">A_6</property>
                 <property name="use_underline">True</property>
-                <property name="icon_name">scanner</property>
-                <property name="menu">scan_button_menu</property>
-                <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
+                <property name="draw_as_radio">True</property>
+                <property name="group">no_crop_menuitem</property>
+                <signal name="toggled" handler="a6_menuitem_toggled_cb" swapped="no"/>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="save_toolbutton">
+              <object class="GtkRadioMenuItem" id="letter_menuitem">
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar button">Save document to a file</property>
-                <property name="is_important">True</property>
-                <property name="label" translatable="yes">Save</property>
+                <property name="label" translatable="yes" comments="Radio button for cropping page to US letter size">_Letter</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-save</property>
-                <signal name="clicked" handler="save_file_button_clicked_cb" swapped="no"/>
+                <property name="draw_as_radio">True</property>
+                <property name="group">no_crop_menuitem</property>
+                <signal name="toggled" handler="letter_menuitem_toggled_cb" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkRadioMenuItem" id="legal_menuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes" comments="Radio button for cropping to page to US legal size">Le_gal</property>
+                <property name="use_underline">True</property>
+                <property name="draw_as_radio">True</property>
+                <property name="group">no_crop_menuitem</property>
+                <signal name="toggled" handler="legal_menuitem_toggled_cb" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkRadioMenuItem" id="four_by_six_menuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4×6</property>
+                <property name="use_underline">True</property>
+                <property name="draw_as_radio">True</property>
+                <property name="group">no_crop_menuitem</property>
+                <signal name="toggled" handler="four_by_six_menuitem_toggled_cb" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkRadioMenuItem" id="a3_menuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes" comments="Radio button for cropping page to A3">A_3</property>
+                <property name="use_underline">True</property>
+                <property name="draw_as_radio">True</property>
+                <property name="group">no_crop_menuitem</property>
+                <signal name="toggled" handler="a3_menuitem_toggled_cb" swapped="no"/>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="stop_toolbutton">
+              <object class="GtkRadioMenuItem" id="custom_crop_menuitem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes" comments="Radio button for cropping to custom page size">_Custom</property>
+                <property name="use_underline">True</property>
+                <property name="draw_as_radio">True</property>
+                <property name="group">no_crop_menuitem</property>
+                <signal name="toggled" handler="custom_crop_menuitem_toggled_cb" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparatorMenuItem" id="crop_sep_menuitem">
+                <property name="visible">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="crop_rotate_menuitem">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes" comments="Tooltip for stop button">Stop the current scan</property>
-                <property name="label" translatable="yes">Stop</property>
+                <property name="label" translatable="yes" comments="Menu item to rotate the crop area">_Rotate Crop</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-stop</property>
-                <signal name="clicked" handler="stop_scan_button_clicked_cb" swapped="no"/>
+                <signal name="activate" handler="crop_rotate_menuitem_activate_cb" swapped="no"/>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="page_move_left_menuitem">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes" comments="Menu item to move the selected page to the left">Move Left</property>
+        <signal name="activate" handler="page_move_left_menuitem_activate_cb" swapped="no"/>
+        <accelerator key="less" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="page_move_right_menuitem">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes" comments="Menu item to move the selected page to the right">Move Right</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="page_move_right_menuitem_activate_cb" swapped="no"/>
+        <accelerator key="greater" signal="activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="copy_to_clipboard_menuitem">
+        <property name="label">gtk-copy</property>
+        <property name="visible">True</property>
+        <property name="sensitive">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <signal name="activate" handler="copy_to_clipboard_button_clicked_cb" swapped="no"/>
+        <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="page_delete_menuitem">
+        <property name="label">gtk-delete</property>
+        <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <signal name="activate" handler="page_delete_menuitem_activate_cb" swapped="no"/>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+  </object>
+  <template class="AppWindow" parent="GtkApplicationWindow">
+    <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
+    <property name="icon_name">org.gnome.SimpleScan</property>
+    <signal name="delete-event" handler="window_delete_event_cb" swapped="no"/>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkStack" id="stack">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="vexpand">True</property>
             <child>
               <object class="GtkAlignment">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="xscale">0</property>
                 <property name="yscale">0</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">10</property>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="opacity">0.5</property>
                         <property name="pixel_size">120</property>
-                        <property name="icon_name">scanner-symbolic</property>
+                        <property name="icon_name">org.gnome.SimpleScan-symbolic</property>
                         <property name="icon_size">6</property>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="status_primary_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="Label shown when searching for scanners">Searching for Scanners…</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                           <attribute name="scale" value="1.5"/>
@@ -628,27 +219,16 @@
                           <class name="dim-label"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="status_secondary_label">
                         <property name="visible">False</property>
-                        <property name="can_focus">False</property>
                         <property name="track_visited_links">False</property>
                         <signal name="activate_link" handler="status_label_activate_link_cb" swapped="no"/>
                         <style>
                           <class name="dim-label"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
@@ -660,53 +240,36 @@
             <child>
               <object class="GtkBox" id="main_vbox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <placeholder/>
-                </child>
-                <child>
                   <object class="GtkActionBar" id="action_bar">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="pack_type">end</property>
-                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="name">document</property>
-                <property name="position">1</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
         </child>
       </object>
     </child>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="vexpand">True</property>
         <property name="show_close_button">True</property>
         <child>
           <object class="GtkBox" id="open_box">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="valign">center</property>
             <child>
               <object class="GtkButton" id="stop_button">
                 <property name="label" translatable="yes">Stop</property>
-                <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for stop button">Stop the current scan</property>
                 <property name="use_underline">True</property>
@@ -716,17 +279,11 @@
                   <class name="destructive-action"/>
                 </style>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="scan_button">
                 <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar button">Scan a single page from the scanner</property>
                 <property name="use_underline">True</property>
@@ -736,30 +293,31 @@
                   <class name="suggested-action"/>
                 </style>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkMenuButton" id="open_button">
+              <object class="GtkMenuButton">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
-                <property name="popup">scan_button_hb_menu</property>
+                <property name="popover">scan_options_popover</property>
                 <child>
-                  <placeholder/>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkImage" id="scan_options_image">
+                        <property name="visible">True</property>
+                        <property name="icon_name">scanner-symbolic</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="icon_name">pan-down-symbolic</property>
+                      </object>
+                    </child>
+                  </object>
                 </child>
-                <style>
-                  <class name="text-button"/>
-                </style>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
             </child>
             <style>
               <class name="linked"/>
@@ -769,13 +327,11 @@
         <child>
           <object class="GtkMenuButton" id="menu_button">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="receives_default">False</property>
             <property name="use_underline">True</property>
             <child>
               <object class="GtkImage">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">open-menu-symbolic</property>
                 <property name="icon_size">1</property>
               </object>
@@ -786,14 +342,12 @@
           </object>
           <packing>
             <property name="pack_type">end</property>
-            <property name="position">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkButton" id="save_button">
             <property name="visible">True</property>
             <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
             <property name="receives_default">False</property>
             <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar button">Save document to a file</property>
             <property name="use_underline">True</property>
@@ -801,7 +355,6 @@
             <child>
               <object class="GtkImage" id="save_image">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">document-save-symbolic</property>
                 <property name="icon_size">1</property>
               </object>
@@ -812,7 +365,6 @@
           </object>
           <packing>
             <property name="pack_type">end</property>
-            <property name="position">3</property>
           </packing>
         </child>
         <style>
@@ -821,63 +373,169 @@
       </object>
     </child>
   </template>
-  <object class="GtkMenu" id="scan_button_menu">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="scan_single_button_menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="scan_all_button_menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="batch_button_menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan continuously from the flatbed">_Multiple Pages From Flatbed</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="batch_button_clicked_cb" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="menuitem1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkRadioMenuItem" id="text_button_menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Text</property>
-        <property name="use_underline">True</property>
-        <property name="draw_as_radio">True</property>
-        <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
-      </object>
-    </child>
+  <object class="GtkPopover" id="scan_options_popover">
     <child>
-      <object class="GtkRadioMenuItem" id="photo_button_menuitem">
+      <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Photo</property>
-        <property name="use_underline">True</property>
-        <property name="active">True</property>
-        <property name="draw_as_radio">True</property>
-        <property name="group">text_button_menuitem</property>
-        <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
+        <property name="orientation">vertical</property>
+        <property name="margin">12</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkRadioButton" id="scan_single_radio">
+            <property name="visible">True</property>
+            <property name="draw_indicator">False</property>
+            <signal name="toggled" handler="scan_single_radio_toggled_cb" swapped="no"/>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="spacing">12</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="icon_name">scanner-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Single Page</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="scan_adf_radio">
+            <property name="visible">True</property>
+            <property name="draw_indicator">False</property>
+            <property name="group">scan_single_radio</property>
+            <signal name="toggled" handler="scan_adf_radio_toggled_cb" swapped="no"/>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="spacing">12</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="icon_name">scan-type-adf-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">All Pages From _Feeder</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="scan_batch_radio">
+            <property name="visible">True</property>
+            <property name="draw_indicator">False</property>
+            <property name="group">scan_single_radio</property>
+            <signal name="toggled" handler="scan_batch_radio_toggled_cb" swapped="no"/>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="spacing">12</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="icon_name">scan-type-batch-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Multiple Pages From Flatbed</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="text_radio">
+            <property name="visible">True</property>
+            <property name="draw_indicator">False</property>
+            <property name="margin_top">12</property>
+            <signal name="toggled" handler="text_radio_toggled_cb" swapped="no"/>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="spacing">12</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="icon_name">text-x-generic-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Text</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="photo_radio">
+            <property name="visible">True</property>
+            <property name="draw_indicator">False</property>
+            <property name="group">text_radio</property>
+            <signal name="toggled" handler="photo_radio_toggled_cb" swapped="no"/>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="spacing">12</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="icon_name">image-x-generic-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Image</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
       </object>
     </child>
   </object>
 </interface>
+
diff --git a/src/app-window.vala b/src/app-window.vala
index 67c882c..efcaaf2 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -18,28 +18,25 @@ public class AppWindow : Gtk.ApplicationWindow
 {
     private const GLib.ActionEntry[] action_entries =
     {
-        { "new_document", new_document_activate_cb },
-        { "reorder", reorder_document_activate_cb },
+        { "new_document", new_document_cb },
+        { "reorder", reorder_document_cb },
         { "save", save_document_activate_cb },
-        { "email", email_document_activate_cb },
-        { "print", print_document_activate_cb },
-        { "preferences", preferences_activate_cb },
-        { "help", help_contents_activate_cb },
-        { "about", about_activate_cb },
-        { "quit", quit_activate_cb }
+        { "email", email_document_cb },
+        { "print", print_document_cb },
+        { "preferences", preferences_cb },
+        { "help", help_cb },
+        { "about", about_cb },
+        { "quit", quit_cb }
     };
 
     private Settings settings;
+    private ScanType scan_type = ScanType.SINGLE;
 
     private PreferencesDialog preferences_dialog;
 
     [GtkChild]
     private Gtk.HeaderBar header_bar;
     [GtkChild]
-    private Gtk.MenuBar menubar;
-    [GtkChild]
-    private Gtk.Toolbar toolbar;
-    [GtkChild]
     private Gtk.Menu page_menu;
     [GtkChild]
     private Gtk.Stack stack;
@@ -76,22 +73,10 @@ public class AppWindow : Gtk.ApplicationWindow
     [GtkChild]
     private Gtk.MenuItem crop_rotate_menuitem;
     [GtkChild]
-    private Gtk.MenuItem save_menuitem;
-    [GtkChild]
-    private Gtk.MenuItem email_menuitem;
-    [GtkChild]
-    private Gtk.MenuItem print_menuitem;
-    [GtkChild]
     private Gtk.MenuItem copy_to_clipboard_menuitem;
     [GtkChild]
     private Gtk.Button save_button;
     [GtkChild]
-    private Gtk.ToolButton save_toolbutton;
-    [GtkChild]
-    private Gtk.MenuItem stop_scan_menuitem;
-    [GtkChild]
-    private Gtk.ToolButton stop_toolbutton;
-    [GtkChild]
     private Gtk.Button stop_button;
     [GtkChild]
     private Gtk.Button scan_button;
@@ -101,25 +86,24 @@ public class AppWindow : Gtk.ApplicationWindow
     private Gtk.Button delete_button;
 
     [GtkChild]
-    private Gtk.RadioMenuItem text_button_menuitem;
+    private Gtk.Image scan_options_image;
     [GtkChild]
-    private Gtk.RadioMenuItem text_button_hb_menuitem;
+    private Gtk.RadioButton scan_single_radio;
     [GtkChild]
-    private Gtk.RadioMenuItem text_menuitem;
+    private Gtk.RadioButton scan_adf_radio;
     [GtkChild]
-    private Gtk.RadioMenuItem photo_button_menuitem;
+    private Gtk.RadioButton scan_batch_radio;
     [GtkChild]
-    private Gtk.RadioMenuItem photo_button_hb_menuitem;
+    private Gtk.RadioButton text_radio;
     [GtkChild]
-    private Gtk.RadioMenuItem photo_menuitem;
+    private Gtk.RadioButton photo_radio;
 
     [GtkChild]
     private Gtk.MenuButton menu_button;
 
+    private bool have_devices = false;
     private string? missing_driver = null;
 
-    private Gtk.FileChooserDialog? save_dialog;
-
     public Book book { get; private set; }
     private bool book_needs_saving;
     private string? book_uri = null;
@@ -153,8 +137,6 @@ public class AppWindow : Gtk.ApplicationWindow
             stack.set_visible_child_name ("document");
             page_delete_menuitem.sensitive = !value;
             delete_button.sensitive = !value;
-            stop_scan_menuitem.sensitive = value;
-            stop_toolbutton.sensitive = value;
             scan_button.visible = !value;
             stop_button.visible = value;
         }
@@ -256,20 +238,22 @@ public class AppWindow : Gtk.ApplicationWindow
         password = authorize_dialog.get_password ();
     }
 
-    public void set_scan_devices (List<ScanDevice> devices, string? missing_driver = null)
+    private void update_scan_status ()
     {
-        this.missing_driver = missing_driver;
-
-        preferences_dialog.set_scan_devices (devices);
-
-        if (devices != null)
+        if (!have_devices)
+        {
+            status_primary_label.set_text (/* Label shown when searching for scanners */
+                                           _("Searching for Scanners…"));
+            status_secondary_label.visible = false;
+        }
+        else if (selected_device != null)
         {
             status_primary_label.set_text (/* Label shown when detected a scanner */
                                            _("Ready to Scan"));
             status_secondary_label.set_text (preferences_dialog.get_selected_device_label ());
             status_secondary_label.visible = true;
         }
-        else if (missing_driver != null)
+        else if (this.missing_driver != null)
         {
             status_primary_label.set_text (/* Warning displayed when no drivers are installed but a compatible scanner is detected */
                                            _("Additional software needed"));
@@ -287,7 +271,15 @@ public class AppWindow : Gtk.ApplicationWindow
         }
     }
 
-    private string choose_file_location ()
+    public void set_scan_devices (List<ScanDevice> devices, string? missing_driver = null)
+    {
+        have_devices = true;
+        this.missing_driver = missing_driver;
+        preferences_dialog.set_scan_devices (devices);
+        update_scan_status ();
+    }
+
+    private string? choose_file_location ()
     {
         /* Get directory to save to */
         string? directory = null;
@@ -296,13 +288,12 @@ public class AppWindow : Gtk.ApplicationWindow
         if (directory == null || directory == "")
             directory = Environment.get_user_special_dir (UserDirectory.DOCUMENTS);
 
-        save_dialog = new Gtk.FileChooserDialog (/* Save dialog: Dialog title */
-                                                 _("Save As…"),
-                                                 this,
-                                                 Gtk.FileChooserAction.SAVE,
-                                                 _("_Cancel"), Gtk.ResponseType.CANCEL,
-                                                 _("_Save"), Gtk.ResponseType.ACCEPT,
-                                                 null);
+        var save_dialog = new Gtk.FileChooserNative (/* Save dialog: Dialog title */
+                                                     _("Save As…"),
+                                                     this,
+                                                     Gtk.FileChooserAction.SAVE,
+                                                     _("_Save"),
+                                                     _("_Cancel"));
         save_dialog.local_only = false;
         if (book_uri != null)
             save_dialog.set_uri (book_uri);
@@ -365,18 +356,18 @@ public class AppWindow : Gtk.ApplicationWindow
         /* Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP) */
         var label = new Gtk.Label (_("File format:"));
         label.visible = true;
-        box.pack_start (label, false, false, 0);
+        box.add (label);
 
         var file_type_combo = new Gtk.ComboBox.with_model (file_type_store);
         file_type_combo.visible = true;
         var renderer = new Gtk.CellRendererText ();
         file_type_combo.pack_start (renderer, true);
         file_type_combo.add_attribute (renderer, "text", 0);
-        box.pack_start (file_type_combo, false, true, 0);
+        box.add (file_type_combo);
 
         /* Label in save dialog beside compression slider */
         var quality_label = new Gtk.Label (_("Compression:"));
-        box.pack_start (quality_label, false, false, 0);
+        box.add (quality_label);
 
         var quality_adjustment = new Gtk.Adjustment (75, 0, 100, 1, 10, 0);
         var quality_scale = new Gtk.Scale (Gtk.Orientation.HORIZONTAL, quality_adjustment);
@@ -388,7 +379,7 @@ public class AppWindow : Gtk.ApplicationWindow
         quality_scale.add_mark (100, Gtk.PositionType.BOTTOM, null);
         quality_adjustment.value = settings.get_int ("jpeg-quality");
         quality_adjustment.value_changed.connect (() => { settings.set_int ("jpeg-quality", (int) quality_adjustment.value); });
-        box.pack_start (quality_scale, false, false, 0);
+        box.add (quality_scale);
 
         file_type_combo.set_active (0);
         file_type_combo.changed.connect (() =>
@@ -412,12 +403,14 @@ public class AppWindow : Gtk.ApplicationWindow
             quality_scale.visible = quality_label.visible = (extension != ".png");
         });
 
-        string? uri = null;
         while (true)
         {
             var response = save_dialog.run ();
             if (response != Gtk.ResponseType.ACCEPT)
-                break;
+            {
+                save_dialog.destroy ();
+                return null;
+            }
 
             var extension = "";
             Gtk.TreeIter i;
@@ -431,7 +424,7 @@ public class AppWindow : Gtk.ApplicationWindow
             if (extension_index < 0)
                 path += extension;
 
-            uri = File.new_for_path (path).get_uri ();
+            var uri = File.new_for_path (path).get_uri ();
 
             /* Check the file(s) don't already exist */
             var files = new List<File> ();
@@ -448,16 +441,14 @@ public class AppWindow : Gtk.ApplicationWindow
             else
                 files.append (File.new_for_uri (uri));
 
-            if (check_overwrite (save_dialog, files))
-                break;
+            if (check_overwrite (save_dialog.transient_for, files))
+            {
+                settings.set_string ("save-directory", save_dialog.get_current_folder ());
+                save_dialog.destroy ();
+                return uri;
+            }
         }
 
-        settings.set_string ("save-directory", save_dialog.get_current_folder ());
-
-        save_dialog.destroy ();
-        save_dialog = null;
-
-        return uri;
     }
 
     private bool check_overwrite (Gtk.Window parent, List<File> files)
@@ -514,6 +505,7 @@ public class AppWindow : Gtk.ApplicationWindow
         var progress_bar =  new CancellableProgressBar (_("Saving"), cancellable);
         action_bar.pack_end (progress_bar);
         progress_bar.visible = true;
+        save_button.sensitive = false;
         try
         {
             yield book.save_async (format, settings.get_int ("jpeg-quality"), file, (fraction) =>
@@ -523,6 +515,7 @@ public class AppWindow : Gtk.ApplicationWindow
         }
         catch (Error e)
         {
+            save_button.sensitive = true;
             progress_bar.destroy ();
             warning ("Error saving file: %s", e.message);
             show_error_dialog (/* Title of error dialog when save failed */
@@ -530,6 +523,7 @@ public class AppWindow : Gtk.ApplicationWindow
                                e.message);
             return false;
         }
+        save_button.sensitive = true;
         progress_bar.destroy_with_delay (500);
 
         book_needs_saving = false;
@@ -576,14 +570,9 @@ public class AppWindow : Gtk.ApplicationWindow
         book.clear ();
         book_needs_saving = false;
         book_uri = null;
-        save_menuitem.sensitive = false;
-        email_menuitem.sensitive = false;
-        print_menuitem.sensitive = false;
         save_button.sensitive = false;
-        save_toolbutton.sensitive = false;
         copy_to_clipboard_menuitem.sensitive = false;
-        status_primary_label.set_text (/* Label shown when detected a scanner */
-                                       _("Ready to Scan"));
+        update_scan_status ();
         stack.set_visible_child_name ("startup");
     }
 
@@ -616,15 +605,51 @@ public class AppWindow : Gtk.ApplicationWindow
         return false;
     }
 
-    [GtkCallback]
-    private void new_button_clicked_cb (Gtk.Widget widget)
+    private void new_document_cb ()
     {
         new_document();
     }
 
-    public void new_document_activate_cb ()
+    private void set_scan_type (ScanType scan_type)
     {
-        new_document();
+        this.scan_type = scan_type;
+
+        switch (scan_type)
+        {
+        case ScanType.SINGLE:
+            scan_single_radio.active = true;
+            scan_options_image.icon_name = "scanner-symbolic";
+            break;
+        case ScanType.ADF_BOTH:
+            scan_adf_radio.active = true;
+            scan_options_image.icon_name = "scan-type-adf-symbolic";
+            break;
+        case ScanType.BATCH:
+            scan_batch_radio.active = true;
+            scan_options_image.icon_name = "scan-type-batch-symbolic";
+            break;
+        }
+    }
+
+    [GtkCallback]
+    private void scan_single_radio_toggled_cb (Gtk.ToggleButton button)
+    {
+        if (button.active)
+            set_scan_type (ScanType.SINGLE);
+    }
+
+    [GtkCallback]
+    private void scan_adf_radio_toggled_cb (Gtk.ToggleButton button)
+    {
+        if (button.active)
+            set_scan_type (ScanType.ADF_BOTH);
+    }
+
+    [GtkCallback]
+    private void scan_batch_radio_toggled_cb (Gtk.ToggleButton button)
+    {
+        if (button.active)
+            set_scan_type (ScanType.BATCH);
     }
 
     private void set_document_hint (string document_hint, bool save = false)
@@ -633,15 +658,11 @@ public class AppWindow : Gtk.ApplicationWindow
 
         if (document_hint == "text")
         {
-            text_button_menuitem.active = true;
-            text_button_hb_menuitem.active = true;
-            text_menuitem.active = true;
+            text_radio.active = true;
         }
         else if (document_hint == "photo")
         {
-            photo_button_menuitem.active = true;
-            photo_button_hb_menuitem.active = true;
-            photo_menuitem.active = true;
+            photo_radio.active = true;
         }
 
         if (save)
@@ -649,16 +670,16 @@ public class AppWindow : Gtk.ApplicationWindow
     }
 
     [GtkCallback]
-    private void text_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    private void text_radio_toggled_cb (Gtk.ToggleButton button)
     {
-        if (widget.active)
+        if (button.active)
             set_document_hint ("text", true);
     }
 
     [GtkCallback]
-    private void photo_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    private void photo_radio_toggled_cb (Gtk.ToggleButton button)
     {
-        if (widget.active)
+        if (button.active)
             set_document_hint ("photo", true);
     }
 
@@ -689,7 +710,9 @@ public class AppWindow : Gtk.ApplicationWindow
     private void scan_button_clicked_cb (Gtk.Widget widget)
     {
         var options = make_scan_options ();
-        options.type = ScanType.SINGLE;
+        options.type = scan_type;
+        if (options.type == ScanType.ADF_BOTH)
+            options.type = preferences_dialog.get_page_side ();
         status_primary_label.set_text (/* Label shown when scan started */
                                        _("Contacting scanner…"));
         start_scan (selected_device, options);
@@ -701,34 +724,7 @@ public class AppWindow : Gtk.ApplicationWindow
         stop_scan ();
     }
 
-    [GtkCallback]
-    private void continuous_scan_button_clicked_cb (Gtk.Widget widget)
-    {
-        if (scanning)
-            stop_scan ();
-        else
-        {
-            var options = make_scan_options ();
-            options.type = preferences_dialog.get_page_side ();
-            start_scan (selected_device, options);
-        }
-    }
-
-    [GtkCallback]
-    private void batch_button_clicked_cb (Gtk.Widget widget)
-    {
-        var options = make_scan_options ();
-        options.type = ScanType.BATCH;
-        start_scan (selected_device, options);
-    }
-
-    [GtkCallback]
-    private void preferences_button_clicked_cb (Gtk.Widget widget)
-    {
-        preferences_dialog.present ();
-    }
-
-    public void preferences_activate_cb ()
+    private void preferences_cb ()
     {
         preferences_dialog.present ();
     }
@@ -975,7 +971,7 @@ public class AppWindow : Gtk.ApplicationWindow
         dialog.modal = true;
         dialog.border_width = 12;
         /* Title of dialog to reorder pages */
-        dialog.title = _("Reorder Pages");
+        dialog.title = C_("dialog title", "Reorder Pages");
         dialog.set_transient_for (this);
         dialog.key_press_event.connect ((e) =>
         {
@@ -1039,13 +1035,7 @@ public class AppWindow : Gtk.ApplicationWindow
         dialog.present ();
     }
 
-    public void reorder_document_activate_cb ()
-    {
-        reorder_document ();
-    }
-
-    [GtkCallback]
-    private void reorder_menuitem_activate_cb (Gtk.Widget widget)
+    private void reorder_document_cb ()
     {
         reorder_document ();
     }
@@ -1060,11 +1050,13 @@ public class AppWindow : Gtk.ApplicationWindow
 
         var label = new Gtk.Label (text);
         label.visible = true;
-        vbox.pack_start (label, true, true, 0);
+        label.vexpand = true;
+        vbox.add (label);
 
         var rb = make_reorder_box (items);
         rb.visible = true;
-        vbox.pack_start (rb, true, true, 0);
+        rb.vexpand = true;
+        vbox.add (rb);
 
         return b;
     }
@@ -1081,7 +1073,7 @@ public class AppWindow : Gtk.ApplicationWindow
             {
                 var a = new Gtk.Label ("➤");
                 a.visible = true;
-                box.pack_start (a, false, false, 0);
+                box.add (a);
                 page_box = null;
                 continue;
             }
@@ -1096,7 +1088,7 @@ public class AppWindow : Gtk.ApplicationWindow
             {
                 page_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3);
                 page_box.visible = true;
-                box.pack_start (page_box, false, false, 0);
+                box.add (page_box);
             }
 
             /* Get colours for each page (from Tango palette) */
@@ -1133,7 +1125,7 @@ public class AppWindow : Gtk.ApplicationWindow
 
             var icon = new PageIcon ("%c".printf (items[i]), r, g, b);
             icon.visible = true;
-            page_box.pack_start (icon, false, false, 0);
+            page_box.add (icon);
         }
 
         return box;
@@ -1183,13 +1175,7 @@ public class AppWindow : Gtk.ApplicationWindow
         context.paint ();
     }
 
-    [GtkCallback]
-    private void email_button_clicked_cb (Gtk.Widget widget)
-    {
-        email_document_async.begin ();
-    }
-
-    public void email_document_activate_cb ()
+    private void email_document_cb ()
     {
         email_document_async.begin ();
     }
@@ -1238,13 +1224,7 @@ public class AppWindow : Gtk.ApplicationWindow
         print.draw_page.disconnect (draw_page);
     }
 
-    [GtkCallback]
-    private void print_button_clicked_cb (Gtk.Widget widget)
-    {
-        print_document ();
-    }
-
-    public void print_document_activate_cb ()
+    private void print_document_cb ()
     {
         print_document ();
     }
@@ -1263,13 +1243,7 @@ public class AppWindow : Gtk.ApplicationWindow
         }
     }
 
-    [GtkCallback]
-    private void help_contents_menuitem_activate_cb (Gtk.Widget widget)
-    {
-        launch_help ();
-    }
-
-    public void help_contents_activate_cb ()
+    private void help_cb ()
     {
         launch_help ();
     }
@@ -1289,10 +1263,10 @@ public class AppWindow : Gtk.ApplicationWindow
 
         Gtk.show_about_dialog (this,
                                "title", title,
-                               "program-name", "Simple Scan",
+                               "program-name", _("Simple Scan"),
                                "version", VERSION,
                                "comments", description,
-                               "logo-icon-name", "scanner",
+                               "logo-icon-name", "org.gnome.SimpleScan",
                                "authors", authors,
                                "translator-credits", _("translator-credits"),
                                "website", "https://gitlab.gnome.org/GNOME/simple-scan",
@@ -1302,13 +1276,7 @@ public class AppWindow : Gtk.ApplicationWindow
                                null);
     }
 
-    [GtkCallback]
-    private void about_menuitem_activate_cb (Gtk.Widget widget)
-    {
-        show_about ();
-    }
-
-    public void about_activate_cb ()
+    private void about_cb ()
     {
         show_about ();
     }
@@ -1332,13 +1300,7 @@ public class AppWindow : Gtk.ApplicationWindow
         });
     }
 
-    [GtkCallback]
-    private void quit_menuitem_activate_cb (Gtk.Widget widget)
-    {
-        on_quit ();
-    }
-
-    public void quit_activate_cb ()
+    private void quit_cb ()
     {
         on_quit ();
     }
@@ -1395,14 +1357,16 @@ public class AppWindow : Gtk.ApplicationWindow
         var label = new Gtk.Label (message);
         label.visible = true;
         label.xalign = 0f;
-        dialog.get_content_area ().pack_start (label, true, true, 0);
+        label.vexpand = true;
+        dialog.get_content_area ().add (label);
 
         var instructions_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
         instructions_box.visible = true;
-        dialog.get_content_area ().pack_start (instructions_box, true, true, 0);
+        instructions_box.vexpand = true;
+        dialog.get_content_area ().add (instructions_box);
 
         var stack = new Gtk.Stack ();
-        instructions_box.pack_start (stack, false, false, 0);
+        instructions_box.add (stack);
 
         var spinner = new Gtk.Spinner ();
         spinner.visible = true;
@@ -1416,14 +1380,15 @@ public class AppWindow : Gtk.ApplicationWindow
         instructions_label.visible = true;
         instructions_label.xalign = 0f;
         instructions_label.use_markup = true;
-        instructions_box.pack_start (instructions_label, false, false, 0);
+        instructions_box.add (instructions_label);
 
         label = new Gtk.Label (/* Message in driver install dialog */
                                _("Once installed you will need to restart Simple Scan."));
         label.visible = true;
         label.xalign = 0f;
+        label.vexpand = true;
         dialog.get_content_area ().border_width = 12;
-        dialog.get_content_area ().pack_start (label, true, true, 0);
+        dialog.get_content_area ().add (label);
 
         if (packages_to_install.length > 0)
         {
@@ -1534,64 +1499,48 @@ public class AppWindow : Gtk.ApplicationWindow
 
     private void book_changed_cb (Book book)
     {
-        save_menuitem.sensitive = true;
-        email_menuitem.sensitive = true;
-        print_menuitem.sensitive = true;
         save_button.sensitive = true;
-        save_toolbutton.sensitive = true;
         book_needs_saving = true;
         copy_to_clipboard_menuitem.sensitive = true;
     }
 
     private void load ()
     {
-        var use_header_bar = !is_traditional_desktop ();
-
-        preferences_dialog = new PreferencesDialog (settings, use_header_bar);
+        preferences_dialog = new PreferencesDialog (settings);
         preferences_dialog.delete_event.connect (() => { return true; });
         preferences_dialog.response.connect (() => { preferences_dialog.visible = false; });
 
-        Gtk.IconTheme.get_default ().append_search_path (ICON_DIR);
-
-        Gtk.Window.set_default_icon_name ("scanner");
+        Gtk.Window.set_default_icon_name ("org.gnome.SimpleScan");
 
         var app = Application.get_default () as Gtk.Application;
 
-        if (!use_header_bar)
-        {
-            set_titlebar (null);
-            menubar.visible = true;
-            toolbar.visible = true;
-        }
-        else
-        {
-            /* Set HeaderBar title here because Glade doesn't keep it translated */
-            /* https://bugzilla.gnome.org/show_bug.cgi?id=782753 */
-            /* Title of scan window */
-            header_bar.title = _("Simple Scan");
-
-            app.add_action_entries (action_entries, this);
-
-            app.set_accels_for_action ("app.new_document", { "<Ctrl>N" });
-            app.set_accels_for_action ("app.save", { "<Ctrl>S" });
-            app.set_accels_for_action ("app.email", { "<Ctrl>E" });
-            app.set_accels_for_action ("app.print", { "<Ctrl>P" });
-            app.set_accels_for_action ("app.help", { "F1" });
-            app.set_accels_for_action ("app.quit", { "<Ctrl>Q" });
-
-            var gear_menu = new Menu ();
-            var section = new Menu ();
-            gear_menu.append_section (null, section);
-            section.append (_("Email"), "app.email");
-            section.append (_("Reorder Pages"), "app.reorder");
-            section = new Menu ();
-            gear_menu.append_section (null, section);
-            section.append (_("Preferences"), "app.preferences");
-            section.append (_("Keyboard Shortcuts"), "win.show-help-overlay");
-            section.append (_("Help"), "app.help");
-            section.append (_("About"), "app.about");
-            menu_button.set_menu_model (gear_menu);
-        }
+        /* Set HeaderBar title here because Glade doesn't keep it translated */
+        /* https://bugzilla.gnome.org/show_bug.cgi?id=782753 */
+        /* Title of scan window */
+        header_bar.title = _("Simple Scan");
+
+        app.add_action_entries (action_entries, this);
+
+        app.set_accels_for_action ("app.new_document", { "<Ctrl>N" });
+        app.set_accels_for_action ("app.save", { "<Ctrl>S" });
+        app.set_accels_for_action ("app.email", { "<Ctrl>E" });
+        app.set_accels_for_action ("app.print", { "<Ctrl>P" });
+        app.set_accels_for_action ("app.help", { "F1" });
+        app.set_accels_for_action ("app.quit", { "<Ctrl>Q" });
+
+        var gear_menu = new Menu ();
+        var section = new Menu ();
+        gear_menu.append_section (null, section);
+        section.append (_("Email"), "app.email");
+        section.append (C_("menu", "Reorder Pages"), "app.reorder");
+        section = new Menu ();
+        gear_menu.append_section (null, section);
+        section.append (_("Preferences"), "app.preferences");
+        section.append (_("Keyboard Shortcuts"), "win.show-help-overlay");
+        section.append (_("Help"), "app.help");
+        section.append (_("About Simple Scan"), "app.about");
+        menu_button.set_menu_model (gear_menu);
+
         app.add_window (this);
 
         /* Populate ActionBar (not supported in Glade) */
@@ -1599,7 +1548,7 @@ public class AppWindow : Gtk.ApplicationWindow
         var button = new Gtk.Button.with_label (/* Label on new document button */
                                                _("Start Again…"));
         button.visible = true;
-        button.clicked.connect (new_button_clicked_cb);
+        button.clicked.connect (new_document_cb);
         action_bar.pack_start (button);
 
         var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 10);
@@ -1609,26 +1558,32 @@ public class AppWindow : Gtk.ApplicationWindow
         var rotate_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
         rotate_box.get_style_context ().add_class (Gtk.STYLE_CLASS_LINKED);
         rotate_box.visible = true;
-        box.pack_start (rotate_box, false, true, 0);
+        box.add (rotate_box);
 
         button = new Gtk.Button.from_icon_name ("object-rotate-left-symbolic");
         button.visible = true;
+        button.image.margin_start = 18;
+        button.image.margin_end = 18;
         /* Tooltip for rotate left (counter-clockwise) button */
         button.tooltip_text = _("Rotate the page to the left (counter-clockwise)");
         button.clicked.connect (rotate_left_button_clicked_cb);
-        rotate_box.pack_start (button, false, true, 0);
+        rotate_box.add (button);
 
         button = new Gtk.Button.from_icon_name ("object-rotate-right-symbolic");
         button.visible = true;
+        button.image.margin_start = 18;
+        button.image.margin_end = 18;
         /* Tooltip for rotate right (clockwise) button */
         button.tooltip_text = _("Rotate the page to the right (clockwise)");
         button.clicked.connect (rotate_right_button_clicked_cb);
-        rotate_box.pack_start (button, false, true, 0);
+        rotate_box.add (button);
 
         crop_button = new Gtk.ToggleButton ();
         crop_button.visible = true;
         var image = new Gtk.Image.from_icon_name ("edit-cut-symbolic", Gtk.IconSize.BUTTON);
         image.visible = true;
+        image.margin_start = 18;
+        image.margin_end = 18;
         crop_button.add (image);
         /* Tooltip for crop button */
         crop_button.tooltip_text = _("Crop the selected page");
@@ -1642,14 +1597,16 @@ public class AppWindow : Gtk.ApplicationWindow
             else
                 no_crop_menuitem.active = true;
         });
-        box.pack_start (crop_button, false, true, 0);
+        box.add (crop_button);
 
         delete_button = new Gtk.Button.from_icon_name ("user-trash-symbolic");
         delete_button.visible = true;
+        delete_button.image.margin_start = 18;
+        delete_button.image.margin_end = 18;
         /* Tooltip for delete button */
         delete_button.tooltip_text = _("Delete the selected page");
         delete_button.clicked.connect (() => { book_view.book.delete_page (book_view.selected_page); });
-        box.pack_start (delete_button, false, true, 0);
+        box.add (delete_button);
 
         var document_type = settings.get_string ("document-type");
         if (document_type != null)
@@ -1657,7 +1614,8 @@ public class AppWindow : Gtk.ApplicationWindow
 
         book_view = new BookView (book);
         book_view.border_width = 18;
-        main_vbox.pack_start (book_view, true, true, 0);
+        book_view.vexpand = true;
+        main_vbox.add (book_view);
         book_view.page_selected.connect (page_selected_cb);
         book_view.show_page.connect (show_page_cb);
         book_view.show_menu.connect (show_page_menu_cb);
@@ -1683,28 +1641,6 @@ public class AppWindow : Gtk.ApplicationWindow
         }
     }
 
-    private bool is_desktop (string name)
-    {
-        var desktop_name_list = Environment.get_variable ("XDG_CURRENT_DESKTOP");
-        if (desktop_name_list == null)
-            return false;
-
-        foreach (var n in desktop_name_list.split (":"))
-            if (n == name)
-                return true;
-
-        return false;
-    }
-
-    private bool is_traditional_desktop ()
-    {
-        const string[] traditional_desktops = { "Unity", "XFCE", "MATE", "LXDE", "Cinnamon", "X-Cinnamon", "i3" };
-        foreach (var name in traditional_desktops)
-            if (is_desktop (name))
-                return true;
-        return false;
-    }
-
     private string state_filename
     {
         owned get { return Path.build_filename (Environment.get_user_cache_dir (), "simple-scan", "state"); }
diff --git a/src/authorize-dialog.ui b/src/authorize-dialog.ui
index c099563..79e43fd 100644
--- a/src/authorize-dialog.ui
+++ b/src/authorize-dialog.ui
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <template class="AuthorizeDialog" parent="GtkDialog">
-    <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
@@ -12,13 +11,11 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="authorize_button">
@@ -28,43 +25,28 @@
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="pack_type">end</property>
-            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="vbox5">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="border_width">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkLabel" id="authorize_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="vexpand">True</property>
                 <property name="label" comments="This label is set dynamically and is not translated">To connect to ? you need to authorize</property>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">6</property>
                 <child>
@@ -95,7 +77,6 @@
                 <child>
                   <object class="GtkLabel" id="username_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes" comments="Label beside username entry">_Username for resource:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">username_entry</property>
@@ -108,7 +89,6 @@
                 <child>
                   <object class="GtkLabel" id="password_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes" comments="Label beside password entry">_Password:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">password_entry</property>
@@ -119,18 +99,8 @@
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/src/book-view.vala b/src/book-view.vala
index 3ffcdf8..782a011 100644
--- a/src/book-view.vala
+++ b/src/book-view.vala
@@ -99,11 +99,12 @@ public class BookView : Gtk.Box
         drawing_area.set_size_request (200, 100);
         drawing_area.can_focus = true;
         drawing_area.events = Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK | Gdk.EventMask.FOCUS_CHANGE_MASK | Gdk.EventMask.STRUCTURE_MASK | Gdk.EventMask.SCROLL_MASK;
-        pack_start (drawing_area, true, true, 0);
+        drawing_area.vexpand = true;
+        add (drawing_area);
 
         scroll = new Gtk.Scrollbar (Gtk.Orientation.HORIZONTAL, null);
         adjustment = scroll.adjustment;
-        pack_start (scroll, false, true, 0);
+        add (scroll);
 
         drawing_area.configure_event.connect (configure_cb);
         drawing_area.draw.connect (draw_cb);
diff --git a/src/book.vala b/src/book.vala
index d53b31a..6db2952 100644
--- a/src/book.vala
+++ b/src/book.vala
@@ -11,7 +11,7 @@
 
 public delegate void ProgressionCallback (double fraction);
 
-public class Book
+public class Book : Object
 {
     private List<Page> pages;
 
diff --git a/src/config.vapi b/src/config.vapi
index e6efeda..4c114e4 100644
--- a/src/config.vapi
+++ b/src/config.vapi
@@ -3,5 +3,3 @@ public const string PKGDATADIR;
 public const string LOCALE_DIR;
 public const string GETTEXT_PACKAGE;
 public const string VERSION;
-public const string UI_DIR;
-public const string ICON_DIR;
diff --git a/src/meson.build b/src/meson.build
index 9e40e42..7d535c8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -35,7 +35,6 @@ simple_scan = executable ('simple-scan',
                           c_args: [ '-DVERSION="@0@"'.format (meson.project_version ()),
                                     '-DGETTEXT_PACKAGE="simple-scan"',
                                     '-DLOCALE_DIR="@0@"'.format (localedir),
-                                    '-DICON_DIR="@0@"'.format (icondir),
                                     '-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE' ],
                           link_args: [ '-lm' ],
                           install: true )
diff --git a/src/page-view.vala b/src/page-view.vala
index 03fecfb..abe5e69 100644
--- a/src/page-view.vala
+++ b/src/page-view.vala
@@ -23,7 +23,7 @@ public enum CropLocation
     BOTTOM_RIGHT
 }
 
-public class PageView
+public class PageView : Object
 {
     /* Page being rendered */
     public Page page { get; private set; }
@@ -563,7 +563,7 @@ public class PageView
     private CropLocation get_crop_location (int x, int y)
     {
         if (!page.has_crop)
-            return 0;
+            return CropLocation.NONE;
 
         var cx = page.crop_x;
         var cy = page.crop_y;
diff --git a/src/page.vala b/src/page.vala
index 13de4d2..026fdcc 100644
--- a/src/page.vala
+++ b/src/page.vala
@@ -17,7 +17,7 @@ public enum ScanDirection
     RIGHT_TO_LEFT
 }
 
-public class Page
+public class Page : Object
 {
     /* Width of the page in pixels after rotation applied */
     public int width
diff --git a/src/preferences-dialog.ui b/src/preferences-dialog.ui
index 2272b77..75d8a4c 100644
--- a/src/preferences-dialog.ui
+++ b/src/preferences-dialog.ui
@@ -49,45 +49,15 @@
     </columns>
   </object>
   <template class="PreferencesDialog" parent="GtkDialog">
-    <property name="can_focus">False</property>
     <property name="title" translatable="yes" comments="Title of preferences dialog">Preferences</property>
     <property name="resizable">False</property>
-    <property name="icon_name">scanner</property>
+    <property name="icon_name">org.gnome.SimpleScan</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_top">30</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="preferences_close_button">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkNotebook">
             <property name="visible">True</property>
@@ -96,20 +66,17 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="border_width">30</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">30</property>
                 <child>
                   <object class="GtkGrid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="row_spacing">15</property>
                     <property name="column_spacing">10</property>
                     <child>
                       <object class="GtkLabel" id="source_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Label beside scan source combo box">_Scanner</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">device_combo</property>
@@ -126,7 +93,6 @@
                     <child>
                       <object class="GtkComboBox" id="device_combo">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="model">device_model</property>
                         <signal name="changed" handler="device_combo_changed_cb" swapped="no"/>
@@ -139,7 +105,6 @@
                     <child>
                       <object class="GtkLabel" id="page_side_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Label beside scan side combo box">Scan Sides</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">scan_side_box</property>
@@ -156,7 +121,6 @@
                     <child>
                       <object class="GtkLabel" id="paper_size_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Label beside page size combo box">Page Size</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">1</property>
@@ -172,7 +136,6 @@
                     <child>
                       <object class="GtkComboBox" id="paper_size_combo">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="model">paper_size_model</property>
                       </object>
@@ -184,7 +147,6 @@
                     <child>
                       <object class="GtkBox" id="scan_side_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="homogeneous">True</property>
                         <child>
                           <object class="GtkRadioButton" id="front_side_button">
@@ -195,11 +157,6 @@
                             <property name="active">True</property>
                             <property name="draw_indicator">False</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="back_side_button">
@@ -210,11 +167,6 @@
                             <property name="draw_indicator">False</property>
                             <property name="group">front_side_button</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="both_side_button">
@@ -225,11 +177,6 @@
                             <property name="draw_indicator">False</property>
                             <property name="group">front_side_button</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
                         </child>
                         <style>
                           <class name="linked"/>
@@ -241,22 +188,15 @@
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkGrid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="row_spacing">15</property>
                     <property name="column_spacing">10</property>
                     <child>
                       <object class="GtkLabel" id="page_delay_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Label beside page delay scale">Delay</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">1</property>
@@ -272,7 +212,6 @@
                     <child>
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Preferences dialog: Label above settings for scanning multiple pages from a flatbed">Multiple pages from flatbed</property>
                         <property name="xalign">0</property>
                         <attributes>
@@ -288,7 +227,6 @@
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="homogeneous">True</property>
                         <child>
                           <object class="GtkRadioButton" id="page_delay_3s_button">
@@ -299,11 +237,6 @@
                             <property name="active">True</property>
                             <property name="draw_indicator">False</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="page_delay_5s_button">
@@ -315,11 +248,6 @@
                             <property name="draw_indicator">False</property>
                             <property name="group">page_delay_3s_button</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="page_delay_7s_button">
@@ -331,11 +259,6 @@
                             <property name="draw_indicator">False</property>
                             <property name="group">page_delay_3s_button</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="page_delay_10s_button">
@@ -347,11 +270,6 @@
                             <property name="draw_indicator">False</property>
                             <property name="group">page_delay_3s_button</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="page_delay_15s_button">
@@ -363,11 +281,6 @@
                             <property name="draw_indicator">False</property>
                             <property name="group">page_delay_3s_button</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">4</property>
-                          </packing>
                         </child>
                         <style>
                           <class name="linked"/>
@@ -381,7 +294,6 @@
                     <child>
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Label after page delay radio buttons">Seconds</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">1</property>
@@ -395,11 +307,6 @@
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
               <packing>
@@ -409,7 +316,6 @@
             <child type="tab">
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Preferences Dialog: Tab label for scanning settings">Scanning</property>
               </object>
               <packing>
@@ -419,20 +325,17 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="border_width">30</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">30</property>
                 <child>
                   <object class="GtkGrid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="row_spacing">14</property>
                     <property name="column_spacing">10</property>
                     <child>
                       <object class="GtkLabel" id="text_dpi_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Label beside scan source combo box">_Text Resolution</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">1</property>
@@ -448,7 +351,6 @@
                     <child>
                       <object class="GtkLabel" id="photo_dpi_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Label beside scan source combo box">_Photo Resolution</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">1</property>
@@ -464,7 +366,6 @@
                     <child>
                       <object class="GtkComboBox" id="text_dpi_combo">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="model">text_dpi_model</property>
                       </object>
@@ -476,7 +377,6 @@
                     <child>
                       <object class="GtkComboBox" id="photo_dpi_combo">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="model">photo_dpi_model</property>
                       </object>
@@ -486,22 +386,15 @@
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkGrid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="row_spacing">15</property>
                     <property name="column_spacing">10</property>
                     <child>
                       <object class="GtkLabel" id="brightness_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Label beside brightness scale">Brightness</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">1</property>
@@ -517,7 +410,6 @@
                     <child>
                       <object class="GtkLabel" id="contrast_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Label beside contrast scale">Contrast</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">1</property>
@@ -557,41 +449,25 @@
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">1</property>
                 <property name="tab_expand">True</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Preferences Dialog: Tab for quality settings">Quality</property>
               </object>
               <packing>
-                <property name="position">1</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="1">preferences_close_button</action-widget>
-    </action-widgets>
   </template>
   <object class="GtkSizeGroup" id="label_size_group">
     <widgets>
@@ -606,3 +482,4 @@
     </widgets>
   </object>
 </interface>
+
diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
index d58c066..43f49af 100644
--- a/src/preferences-dialog.vala
+++ b/src/preferences-dialog.vala
@@ -58,15 +58,10 @@ private class PreferencesDialog : Gtk.Dialog
     private Gtk.Adjustment brightness_adjustment;
     [GtkChild]
     private Gtk.Adjustment contrast_adjustment;
-    [GtkChild]
-    private Gtk.Button preferences_close_button;
 
-    public PreferencesDialog (Settings settings, bool use_header_bar)
+    public PreferencesDialog (Settings settings)
     {
-        Object (use_header_bar: use_header_bar ? 1 : -1);
-
-        if (use_header_bar)
-            preferences_close_button.visible = false;
+        Object (use_header_bar: 1);
 
         this.settings = settings;
 
diff --git a/src/scan-type-adf-symbolic.svg b/src/scan-type-adf-symbolic.svg
new file mode 100644
index 0000000..4ddb4de
--- /dev/null
+++ b/src/scan-type-adf-symbolic.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#474747">
+  <path d="m0.52917 3.9688c-0.13229 0-0.26458-0.13229-0.26458-0.26459v-2.1167c0-0.13229 0.13229-0.26459 0.26458-0.26459h0.26458v1.5875h2.6458v-1.5875h0.26458c0.13229 0 0.26458 0.1323 0.26458 0.26459v2.1167c0 0.1323-0.13229 0.26459-0.26458 0.26459z"/>
+  <path d="m1.0583 2.6458v-1.5875h2.1167v1.5875z"/>
+  <path d="m1.0583 0.79376v-0.26459h2.1167v0.26459z"/>
+  <path d="m1.0583 0.26459v-0.26458h2.1167v0.26458z"/>
+ </g>
+</svg>
diff --git a/src/scan-type-batch-symbolic.svg b/src/scan-type-batch-symbolic.svg
new file mode 100644
index 0000000..a11715d
--- /dev/null
+++ b/src/scan-type-batch-symbolic.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#474747">
+  <path d="m2.2521 0.79056c-0.94667 0-1.7198 0.7731-1.7198 1.7198s0.7731 1.7198 1.7198 1.7198 1.7198-0.7731 1.7198-1.7198-0.7731-1.7198-1.7198-1.7198zm0 0.52916c0.66068 0 1.1906 0.52993 1.1906 1.1906s-0.52993 1.1906-1.1906 1.1906-1.1906-0.52993-1.1906-1.1906 0.52993-1.1906 1.1906-1.1906z" color="#000000" color-rendering="auto" dominant-baseline="auto" enable-background="new" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke-width=".26458" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+  <path d="m1.8552-0.00318h0.79374c0.14658 0 0.26458 0.118 0.26458 0.26458s-0.118 0.26458-0.26458 0.26458h-0.79374c-0.14658 0-0.26458-0.118-0.26458-0.26458s0.118-0.26458 0.26458-0.26458z" color="#000000" color-rendering="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke-width=".26458" style="isolation:auto;mix-blend-mode:normal"/>
+  <path d="m2.3844-0.00318v1.0583h-0.26458v-1.0583z" color="#000000" color-rendering="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke-width=".26458" style="isolation:auto;mix-blend-mode:normal"/>
+  <path d="m2.1198 1.5843a1.0583 1.0583 0 0 1 1.0583 1.0583h-1.0583z" color="#000000" enable-background="new" stroke-width="0"/>
+ </g>
+</svg>
diff --git a/src/scanner.vala b/src/scanner.vala
index 58141b8..8bc587f 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -11,13 +11,13 @@
 
 /* TODO: Could indicate the start of the next page immediately after the last page is received (i.e. before the sane_cancel()) */
 
-public class ScanDevice
+public class ScanDevice : Object
 {
     public string name;
     public string label;
 }
 
-public class ScanPageInfo
+public class ScanPageInfo : Object
 {
     /* Width, height in pixels */
     public int width;
@@ -36,7 +36,7 @@ public class ScanPageInfo
     public string device;
 }
 
-public class ScanLine
+public class ScanLine : Object
 {
     /* Line number */
     public int number;
@@ -73,7 +73,7 @@ public enum ScanType
     BATCH
 }
 
-public class ScanOptions
+public class ScanOptions : Object
 {
     public int dpi;
     public ScanMode scan_mode;
@@ -86,7 +86,7 @@ public class ScanOptions
     public int page_delay;
 }
 
-private class ScanJob
+private class ScanJob : Object
 {
     public int id;
     public string device;
@@ -208,7 +208,7 @@ private class NotifyGotLine : Notify
     }
 }
 
-public class Scanner
+public class Scanner : Object
 {
     /* Singleton object */
     private static Scanner scanner_object = null;
@@ -292,7 +292,7 @@ public class Scanner
         return false;
     }
 
-    private void notify (Notify notification)
+    private void notify_event (Notify notification)
     {
         notify_queue.push (notification);
         Idle.add (notify_idle_cb);
@@ -303,7 +303,7 @@ public class Scanner
         if ((scanning && !is_scanning) || (!scanning && is_scanning))
         {
             scanning = is_scanning;
-            notify (new NotifyScanningChanged ());
+            notify_event (new NotifyScanningChanged ());
         }
     }
 
@@ -382,7 +382,7 @@ public class Scanner
         else
             default_device = null;
 
-        notify (new NotifyUpdateDevices ((owned) devices));
+        notify_event (new NotifyUpdateDevices ((owned) devices));
     }
 
     private int scale_int (int source_min, int source_max, Sane.OptionDescriptor option, int value)
@@ -743,7 +743,7 @@ public class Scanner
 
     private static void authorization_cb (string resource, char[] username, char[] password)
     {
-        scanner_object.notify (new NotifyRequestAuthorization (resource));
+        scanner_object.notify_event (new NotifyRequestAuthorization (resource));
 
         var credentials = scanner_object.authorize_queue.pop ();
         for (var i = 0; credentials.username[i] != '\0' && i < Sane.MAX_USERNAME_LEN; i++)
@@ -783,7 +783,7 @@ public class Scanner
     {
         close_device ();
         state = ScanState.IDLE;
-        notify (new NotifyScanFailed (error_code, error_string));
+        notify_event (new NotifyScanFailed (error_code, error_string));
     }
 
     private bool handle_requests ()
@@ -868,7 +868,7 @@ public class Scanner
 
         if (status != Sane.Status.GOOD)
         {
-            warning ("Unable to get open device: %s", Sane.strstatus (status));
+            warning ("Unable to open device: %s", Sane.strstatus (status));
             fail_scan (status,
                        /* Error displayed when cannot connect to scanner */
                        _("Unable to connect to scanner"));
@@ -1039,6 +1039,30 @@ public class Scanner
                     set_bool_option (handle, option, index, job.type == ScanType.ADF_BOTH, null);
             }
 
+            /* Non-standard Epson GT-S50 ADF options */
+            option = get_option_by_name (handle, "adf-mode", out index);
+            if (option != null)
+            {
+                string[] adf_simplex_modes =
+                {
+                    "Simplex"
+                };
+                string[] adf_duplex_modes =
+                {
+                    "Duplex"
+                };
+                if (job.type == ScanType.ADF_BOTH)
+                    set_constrained_string_option (handle, option, index, adf_duplex_modes, null);
+                else
+                    set_constrained_string_option (handle, option, index, adf_simplex_modes, null);
+            }
+            option = get_option_by_name (handle, "adf-auto-scan", out index);
+            if (option != null)
+            {
+                if (option.type == Sane.ValueType.BOOL)
+                    set_bool_option (handle, option, index, true, null);
+            }
+
             /* Multi-page options */
             option = get_option_by_name (handle, "batch-scan", out index);
             if (option != null)
@@ -1203,7 +1227,7 @@ public class Scanner
         /* Trigger timeout to close */
         // TODO
 
-        notify (new NotifyDocumentDone ());
+        notify_event (new NotifyDocumentDone ());
         set_scanning (false);
     }
 
@@ -1211,7 +1235,7 @@ public class Scanner
     {
         Sane.Status status;
 
-        notify (new NotifyExpectPage ());
+        notify_event (new NotifyExpectPage ());
 
         status = Sane.start (handle);
         debug ("sane_start (page=%d, pass=%d) -> %s", page_number, pass_number, Sane.status_to_string (status));
@@ -1265,7 +1289,7 @@ public class Scanner
 
         if (page_number != notified_page)
         {
-            notify (new NotifyGotPageInfo (job.id, info));
+            notify_event (new NotifyGotPageInfo (job.id, info));
             notified_page = page_number;
         }
 
@@ -1282,7 +1306,7 @@ public class Scanner
     {
         var job = (ScanJob) job_queue.data;
 
-        notify (new NotifyPageDone (job.id));
+        notify_event (new NotifyPageDone (job.id));
 
         /* If multi-pass then scan another page */
         if (!parameters.last_frame)
@@ -1300,7 +1324,7 @@ public class Scanner
 
             page_number++;
             pass_number = 0;
-            notify (new NotifyPageDone (job.id));
+            notify_event (new NotifyPageDone (job.id));
             state = ScanState.START;
             return;
         }
@@ -1448,7 +1472,7 @@ public class Scanner
                 line.data_length = (line.width * 2 + 7) / 8;
             }
 
-            notify (new NotifyGotLine (job.id, line));
+            notify_event (new NotifyGotLine (job.id, line));
         }
     }
 
diff --git a/src/simple-scan.gresource.xml b/src/simple-scan.gresource.xml
index a62619e..2348f75 100644
--- a/src/simple-scan.gresource.xml
+++ b/src/simple-scan.gresource.xml
@@ -5,6 +5,10 @@
     <file preprocess="xml-stripblanks">preferences-dialog.ui</file>
     <file preprocess="xml-stripblanks">authorize-dialog.ui</file>
   </gresource>
+  <gresource prefix="/org/gnome/SimpleScan/icons/scalable/actions">
+    <file>scan-type-adf-symbolic.svg</file>
+    <file>scan-type-batch-symbolic.svg</file>
+  </gresource>
   <gresource prefix="/org/gnome/SimpleScan/gtk">
     <file preprocess="xml-stripblanks">help-overlay.ui</file>
   </gresource>
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index d30aa45..0c263f0 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -105,7 +105,7 @@ public class SimpleScan : Gtk.Application
 
     private void update_scan_devices_cb (Scanner scanner, List<ScanDevice> devices)
     {
-        var devices_copy = devices.copy ();
+        var devices_copy = devices.copy_deep ((CopyFunc) Object.ref);
 
         /* If the default device is not detected add it to the list */
         if (default_device != null)