Merge tag 'upstream/3.21.90'

Upstream version 3.21.90

4 files changed, 17 insertions, 72 deletions

diff --git a/help/sk/adf.page b/help/sk/adf.page
index 65aae4d..0da45f5 100644
--- a/help/sk/adf.page
+++ b/help/sk/adf.page
@@ -13,9 +13,9 @@
     </p>
       <steps>
 	<title/>
-	<title>Use a Keyboard Shortcut</title>
+	<title>Používať klávesové skratky</title>
 	<item>
-	  <p>Press <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
+	  <p>Stlač <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
 	</item>      
       </steps>
       
diff --git a/help/sk/brightness-contrast.page b/help/sk/brightness-contrast.page
index d2e64ec..6456228 100644
--- a/help/sk/brightness-contrast.page
+++ b/help/sk/brightness-contrast.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
 
-	<title>Setting brightness and Contrast</title>
+	<title>Nastaviť jas a kontrast</title>
 
     <p>
     Some scanners allow the user to adjust the brightness and contrast when scanning.
diff --git a/help/sk/index.page b/help/sk/index.page
index 352e9db..3836d99 100644
--- a/help/sk/index.page
+++ b/help/sk/index.page
@@ -13,7 +13,7 @@
 		<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 	</info>
 
-	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
+	<title><media type="image" src="figures/icon.png"/> Príručka k programu Jednoduché skenovanie</title>
     
     <section id="acquire" style="2column">
         <title>Skenovanie stránok</title>
@@ -28,6 +28,6 @@
     </section>
 
     <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
+	<title>Simple Scan klávesové skratky</title>
     </section>
 </page>
diff --git a/help/sk/sk.po b/help/sk/sk.po
index d7660c9..56b8e05 100644
--- a/help/sk/sk.po
+++ b/help/sk/sk.po
@@ -9,21 +9,22 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2016-03-12 15:09+0000\n"
+"PO-Revision-Date: 2016-07-09 08:21+0000\n"
 "Last-Translator: Dusan Kazik <prescott66@gmail.com>\n"
 "Language-Team: slovenčina <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-07-10 05:20+0000\n"
+"X-Generator: Launchpad (build 18115)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Dusan Kazik https://launchpad.net/~prescott66"
+"  Dusan Kazik https://launchpad.net/~prescott66\n"
+"  Eduard Hummel https://launchpad.net/~eduardhummel"
 
 #. (itstool) path: credit/name
 #: C/index.page:7
@@ -33,7 +34,7 @@ msgstr "Robert Ancell"
 #. (itstool) path: credit/name
 #: C/index.page:11
 msgid "Ali Shtarbanov"
-msgstr ""
+msgstr "Ali Shtarbanov"
 
 #. (itstool) path: title/media
 #. This is a reference to an external file such as an image or video. When
@@ -50,6 +51,8 @@ msgstr ""
 #: C/index.page:17
 msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
 msgstr ""
+"<media type=\"image\" src=\"figures/icon.png\"/> Príručka k programu "
+"Jednoduché skenovanie"
 
 #. (itstool) path: section/title
 #: C/index.page:20
@@ -69,7 +72,7 @@ msgstr "Použitie dokumentu"
 #. (itstool) path: section/title
 #: C/index.page:32
 msgid "Simple Scan Shortcuts"
-msgstr ""
+msgstr "Simple Scan klávesové skratky"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -86,12 +89,12 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/adf.page:17
 msgid "Use a Keyboard Shortcut"
-msgstr ""
+msgstr "Používať klávesové skratky"
 
 #. (itstool) path: item/p
 #: C/adf.page:19
 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-msgstr ""
+msgstr "Stlač <keyseq><key>Ctrl</key><key>F</key></keyseq>"
 
 #. (itstool) path: steps/title
 #: C/adf.page:24
@@ -160,7 +163,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
 msgid "Setting brightness and Contrast"
-msgstr ""
+msgstr "Nastaviť jas a kontrast"
 
 #. (itstool) path: page/p
 #: C/brightness-contrast.page:11
@@ -730,61 +733,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Pomocník aplikácie Jednoduché skenovanie"
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Otáčanie stránok"
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr "Použite tento typ, ak skenujete viacero stránok s textom."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Použite tento typ, ak chcete upravovať, alebo nahrávať skenované obrázky."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Použite tento typ, ak potrebujete súbory s vysokým rozlíšením na upravovanie"
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Ak máte viacero skenerov, môžete zmeniť, ktorý skener je vybratý z ponuky "
-#~ "<guiseq><gui>Dokument</gui><gui>Nastavenia</gui></guiseq>."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Vaše miestne skenery sú automaticky rozpoznané vždy keď spustíte aplikáciu "
-#~ "<app>Jednoduché skenovanie</app> a vždy keď pripojíte skener prostredníctvom "
-#~ "USB. Ak máte sieťový skener, budete musieť reštartovať aplikáciu "
-#~ "<app>Jednoduché skenovanie</app> kvôli jeho rozpoznaniu."
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Pripojte skener k vášmu počítaču."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Stlačte tlačidlo skenovania v paneli nástrojov (alebo "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "Stránka bude zobrazená, ako bude oskenovaná."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "Oblasť orezania môže byť upravená kliknutím v hranici oblasti orezania a "
-#~ "potiahnutím myši."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr "Každá nová oskenovaná stránka použije predchádzajúce orezanie."