Merge tag 'upstream/3.17.4'

Upstream version 3.17.4

1 files changed, 14 insertions, 13 deletions

diff --git a/po/sk.po b/po/sk.po
index 9f208c2..625dad7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2015-04-15 12:17+1200\n"
-"PO-Revision-Date: 2012-07-23 09:07+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
+"PO-Revision-Date: 2015-06-29 19:13+0000\n"
+"Last-Translator: Laco Gubík <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
-"X-Generator: Launchpad (build 17540)\n"
+"X-Launchpad-Export-Date: 2015-06-30 05:21+0000\n"
+"X-Generator: Launchpad (build 17578)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -35,17 +35,17 @@ msgstr "_Heslo:"
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:8
 msgid "Front and Back"
-msgstr ""
+msgstr "Predná a zadná strana"
 
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:10
 msgid "Front"
-msgstr ""
+msgstr "Predná strana"
 
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Zadná strana"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
@@ -60,7 +60,7 @@ msgstr "_Dokument"
 #. Scan menu item
 #: ../data/simple-scan.ui.h:18
 msgid "Sc_an"
-msgstr ""
+msgstr "_Skenovať"
 
 #. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:20
@@ -94,7 +94,7 @@ msgstr ""
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
 msgid "_Email"
-msgstr ""
+msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:32
@@ -149,7 +149,7 @@ msgstr "Le_gal"
 #. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:52
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:54
@@ -164,12 +164,12 @@ msgstr "_Otočiť výrez"
 #. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr ""
+msgstr "Presunúť doľava"
 
 #. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr ""
+msgstr "Presunúť doprava"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:62
@@ -179,7 +179,7 @@ msgstr "_Pomocník"
 #. Help|Contents menu
 #: ../data/simple-scan.ui.h:64
 msgid "_Contents"
-msgstr ""
+msgstr "_Obsah"
 
 #. Tooltip for new document button
 #: ../data/simple-scan.ui.h:66
@@ -640,6 +640,7 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  6205 https://launchpad.net/~6205-reactivated-deactivatedaccount\n"
 "  Alessio Treglia https://launchpad.net/~quadrispro\n"
+"  Eduard Hummel https://launchpad.net/~eduardhummel\n"
 "  Laco Gubík https://launchpad.net/~laco\n"
 "  Pavol Klačanský https://launchpad.net/~pavolzetor-deactivatedaccount\n"
 "  Prescott_SK https://launchpad.net/~prescott66\n"