Merge branch 'release/debian/3.34.1-1'debian/3.34.1-1

8 files changed, 324 insertions, 11 deletions

diff --git a/help/C/crop.page b/help/C/crop.page
index ab0bf64..69ca197 100644
--- a/help/C/crop.page
+++ b/help/C/crop.page
@@ -9,7 +9,7 @@
 	<title>Cropping</title>
 
     <p>
-    The cropping feature in <app>Simple Scan</app> allows you to use only a part of a scanned image. You can
+    The cropping feature 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 appear 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:
diff --git a/help/C/figures/icon.png b/help/C/figures/icon.png
deleted file mode 100644
index 639c55f..0000000
--- a/help/C/figures/icon.png
+++ /dev/null
diff --git a/help/C/figures/icon.svg b/help/C/figures/icon.svg
new file mode 100644
index 0000000..4d1836f
--- /dev/null
+++ b/help/C/figures/icon.svg
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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"
+   width="128"
+   height="128"
+   id="svg11300"
+   version="1.0"
+   style="display:inline;enable-background:new"
+   viewBox="0 0 128 128">
+  <title
+     id="title4162">Adwaita Icon Template</title>
+  <defs
+     id="defs3">
+    <linearGradient
+       y2="-256"
+       x2="220"
+       y1="-256"
+       x1="-156"
+       gradientTransform="matrix(0.26040102,0,0,0.28124928,228.62254,9.99973)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1137"
+       xlink:href="#linearGradient1367" />
+    <linearGradient
+       id="linearGradient1367">
+      <stop
+         id="stop1363"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1" />
+      <stop
+         id="stop1365"
+         offset="1"
+         style="stop-color:#424048;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       r="200"
+       fy="88.04454"
+       fx="-72.631592"
+       cy="88.04454"
+       cx="-72.631592"
+       gradientTransform="matrix(0.08037048,0,0,2.3749942,234.08741,-273.1054)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1139"
+       xlink:href="#linearGradient1184" />
+    <linearGradient
+       id="linearGradient1184">
+      <stop
+         id="stop1180"
+         offset="0"
+         style="stop-color:#d5d3cf;stop-opacity:1" />
+      <stop
+         id="stop1182"
+         offset="1"
+         style="stop-color:#d5d3cf;stop-opacity:0" />
+    </linearGradient>
+    <clipPath
+       id="clipPath990"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         ry="0"
+         rx="0"
+         y="-71.789413"
+         x="270.26764"
+         height="229.05319"
+         width="288.00003"
+         id="rect992"
+         style="display:inline;opacity:1;vector-effect:none;fill:#e66100;fill-opacity:1;stroke:none;stroke-width:0.0123119px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
+    </clipPath>
+    <filter
+       height="1.0369858"
+       y="-0.018492892"
+       width="1.4684865"
+       x="-0.23424332"
+       id="filter1020"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur1022"
+         stdDeviation="2.3424332" />
+    </filter>
+    <linearGradient
+       y2="-242"
+       x2="-16"
+       y1="-243.12489"
+       x1="-74"
+       gradientTransform="matrix(0.93103454,0,0,1.0588258,292.89656,192.23586)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1141"
+       xlink:href="#linearGradient1056" />
+    <linearGradient
+       id="linearGradient1056">
+      <stop
+         id="stop1052"
+         offset="0"
+         style="stop-color:#6bf9f4;stop-opacity:1;" />
+      <stop
+         id="stop1054"
+         offset="1"
+         style="stop-color:#6bf9f4;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="244"
+       x2="24"
+       y1="244"
+       x1="72"
+       gradientTransform="rotate(-90,61,239)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1143"
+       xlink:href="#linearGradient1064" />
+    <linearGradient
+       id="linearGradient1064">
+      <stop
+         id="stop1060"
+         offset="0"
+         style="stop-color:#6bf9f4;stop-opacity:0.48962656" />
+      <stop
+         id="stop1062"
+         offset="1"
+         style="stop-color:#08c5bf;stop-opacity:0.65098041" />
+    </linearGradient>
+    <linearGradient
+       y2="619.96387"
+       x2="583.64319"
+       y1="619.96387"
+       x1="231.99998"
+       gradientTransform="matrix(-0.24999998,0,0,0.24999998,145.99999,125.00905)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1145"
+       xlink:href="#linearGradient1023" />
+    <linearGradient
+       id="linearGradient1023">
+      <stop
+         id="stop1011"
+         offset="0"
+         style="stop-color:#d5d3cf;stop-opacity:1" />
+      <stop
+         style="stop-color:#e4e1de;stop-opacity:1"
+         offset="0.04550065"
+         id="stop1013" />
+      <stop
+         id="stop1015"
+         offset="0.09100132"
+         style="stop-color:#b8b4ae;stop-opacity:1" />
+      <stop
+         style="stop-color:#ada9a1;stop-opacity:1"
+         offset="0.91001338"
+         id="stop1017" />
+      <stop
+         id="stop1019"
+         offset="0.95551407"
+         style="stop-color:#e4e1de;stop-opacity:1" />
+      <stop
+         id="stop1021"
+         offset="1"
+         style="stop-color:#d5d3cf;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <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:creator>
+          <cc:Agent>
+            <dc:title>GNOME Design Team</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:title>Adwaita Icon Template</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <dc:date />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier />
+        <dc:relation />
+        <dc:language />
+        <dc:coverage />
+        <dc:description />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-163.25424,1.6271186)"
+     id="g937">
+    <g
+       style="display:inline;enable-background:new"
+       id="g1135"
+       transform="translate(183.25424,-173.62712)">
+      <rect
+         transform="rotate(90)"
+         style="display:inline;opacity:1;vector-effect:none;fill:#deddda;fill-opacity:1;stroke:none;stroke-width:0.01184965px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+         id="rect1109"
+         width="111.91078"
+         height="87.999786"
+         x="180"
+         y="-88"
+         rx="7.9999995"
+         ry="8.7999821" />
+      <g
+         transform="rotate(-180,54.000023,234)"
+         id="g1131">
+        <rect
+           ry="4.75"
+           rx="4.75"
+           y="-100"
+           x="188"
+           height="72"
+           width="92"
+           id="rect1111"
+           style="display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient1137);fill-opacity:1;stroke:none;stroke-width:0.01231192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+           transform="rotate(90)" />
+        <rect
+           ry="0"
+           rx="0"
+           y="-100"
+           x="188"
+           height="72"
+           width="92"
+           id="rect1113"
+           style="display:inline;opacity:0.48600003;vector-effect:none;fill:url(#radialGradient1139);fill-opacity:1;stroke:none;stroke-width:0.01205269px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+           transform="rotate(90)" />
+        <path
+           clip-path="url(#clipPath990)"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;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:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#6bf9f4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:13.85640621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter1020);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
+           d="m 372.26766,-113.05191 v 304 h 24 v -304 z"
+           id="path1115"
+           transform="matrix(1.7947455e-8,0.33333331,-0.31425019,0,77.44022,97.91079)" />
+        <rect
+           y="36"
+           x="-228"
+           height="60"
+           width="4"
+           id="rect1117"
+           style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           transform="rotate(-90)" />
+        <rect
+           transform="rotate(90)"
+           style="display:inline;opacity:0.8;vector-effect:none;fill:url(#linearGradient1141);fill-opacity:1;stroke:none;stroke-width:0.01222421px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+           id="rect1119"
+           width="54"
+           height="72.000076"
+           x="224"
+           y="-100.00006"
+           rx="0"
+           ry="0" />
+        <path
+           style="opacity:1;fill:url(#linearGradient1143);fill-opacity:1;stroke:#abebe9;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 95,227 v 46 c 0,0 0,2 -2,2 H 35 c -2,0 -2,-2 -2,-2 v -46"
+           id="path1121" />
+        <g
+           transform="matrix(0,-1,-1,0,306,300)"
+           id="g1127">
+          <path
+             style="display:inline;opacity:1;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:0.50000006;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
+             clip-path="none"
+             d="m 74,210 v 64 h 12 l 9,-15 13,-7 v -39 c 0,-3 -3,-3 -3,-3 z"
+             id="path1123" />
+          <path
+             style="display:inline;opacity:1;vector-effect:none;fill:#deddda;fill-opacity:1;stroke:none;stroke-width:0.50000006;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+             d="M 108,252 H 89 c 0,0 -3,0 -3,3 v 19 z"
+             id="path1125" />
+        </g>
+        <path
+           id="path1129"
+           d="M 100.00006,224 H 27.99998 v 4 h 72.00008 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;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:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.89331603;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
+           clip-path="none" />
+      </g>
+      <path
+         id="path1133"
+         d="m 87.99998,280.00001 1e-5,4.00001 c 1e-5,4.43197 -3.56799,7.99999 -8,7.99999 l -71.999997,1e-5 c -4.431989,0 -7.999992,-3.56801 -7.999995,-8.00001 l -3e-6,-3.99997 C 3e-6,284.43201 3.568004,288 8,288 l 72.00001,3e-5 c 4.43199,0 7.99999,-3.56802 7.99997,-8.00002 z"
+         style="display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient1145);fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
+    </g>
+  </g>
+</svg>
diff --git a/help/C/index.page b/help/C/index.page
index 9ddb34f..2c734e5 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -14,8 +14,8 @@
 		<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
 	</info>
 
-	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
+       <title><media type="image" src="figures/icon.svg" height="32px"/>Document Scanner Manual</title>
+
     <section id="acquire" style="2column">
         <title>Scanning Pages</title>
     </section>
diff --git a/help/C/print.page b/help/C/print.page
index 5c7794a..9726bee 100644
--- a/help/C/print.page
+++ b/help/C/print.page
@@ -9,9 +9,8 @@
 	<title>Printing</title>
 
     <p>
-    <app>Simple Scan</app> allows you print a scanned document directly from the its
-    interface, without having to save the document first. This feature makes <app>Simple
-    Scan</app> a very convenient tool for making copies of documents or photos. 
+    You are able to print a scanned document directly without having to save
+    the document first. This is convenient for making copies of documents or photos.
     </p>
     <steps>
       <title>To Print a Document</title>
diff --git a/help/C/rotate.page b/help/C/rotate.page
index b64c69f..3dc7508 100644
--- a/help/C/rotate.page
+++ b/help/C/rotate.page
@@ -9,7 +9,7 @@
 	<title>Rotating a Page</title>
 
     <p>
-    In <app>Simple Scan</app>, you can change the rotation of a page either before or after scanning the page.
+    You can change the rotation of a page either before or after scanning the page.
     Currently, there are four ways to rotate a page: 
     </p>
     
diff --git a/help/C/scanner.page b/help/C/scanner.page
index 3762cc1..efcbb0f 100644
--- a/help/C/scanner.page
+++ b/help/C/scanner.page
@@ -13,8 +13,9 @@
     </p>
     <media type="image" src="figures/preferences.png"/>
     <p>
-    Your local scanners are automatically detected each time you start <app>Simple Scan</app>
-    and each time you plug in a USB scanner. If you connect a network scanner while <app>Simple Scan</app>
-    is running, you will need to restart <app>Simple Scan</app> for the scanner to be detected.
+    Local scanners are automatically detected each time <app>Document Scanner</app>
+    starts and each time you plug in a USB scanner. If you connect a network
+    scanner you will need to restart <app>Document Scanner</app> for the scanner
+    to be detected.
     </p>
 </page>
diff --git a/help/C/scanning.page b/help/C/scanning.page
index c48a99d..a106dc8 100644
--- a/help/C/scanning.page
+++ b/help/C/scanning.page
@@ -14,7 +14,7 @@
     </p>
     <steps>
       <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Open <app>Simple Scan</app>.</p></item>
+      <item><p>Open <app>Document Scanner</app>.</p></item>
       <item><p>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>.</p>
 	     <media type="image" src="figures/scan_toolbar.png"/></item>