Merge tag 'upstream/3.17.1'

Upstream version 3.17.1

1 files changed, 30 insertions, 16 deletions

diff --git a/po/ast.po b/po/ast.po
index b362e5c..3a8c458 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Asturian <ast@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-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr ""
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -89,7 +90,7 @@ msgstr "Semeya"
 #. Title of dialog to reorder pages
 #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reordenar les páxines"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -293,7 +294,7 @@ msgstr "Calidá:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Escáner de documentos"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -301,6 +302,19 @@ msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
+msgstr "escanear;escáner;planu;adf;"
+
+#: ../data/simple-scan.appdata.xml.in.h:2
+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.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
@@ -557,22 +571,22 @@ msgstr ""
 #. Label on button for combining sides in reordering dialog
 #: ../src/ui.vala:1203
 msgid "Combine sides"
-msgstr ""
+msgstr "Combinar llaos"
 
 #. Label on button for combining sides in reverse order in reordering dialog
 #: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Combinar llaos (inversu)"
 
 #. Label on button for reversing in reordering dialog
 #: ../src/ui.vala:1223
 msgid "Reverse"
-msgstr ""
+msgstr "Inversu"
 
 #. Label on button for cancelling page reordering dialog
 #: ../src/ui.vala:1233
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Caltener ensin cambeos"
 
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.vala:1448
@@ -663,31 +677,31 @@ msgstr ""
 
 #: ../src/ui.vala:1683
 msgid "New Document"
-msgstr ""
+msgstr "Documentu nuevu"
 
 #: ../src/ui.vala:1688
 msgid "Document"
-msgstr ""
+msgstr "Documentu"
 
 #: ../src/ui.vala:1692
 msgid "Email..."
-msgstr ""
+msgstr "Corréu-e..."
 
 #: ../src/ui.vala:1693
 msgid "Print..."
-msgstr ""
+msgstr "Imprentar..."
 
 #: ../src/ui.vala:1701
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: ../src/ui.vala:1702
 msgid "About"
-msgstr ""
+msgstr "Tocante a"
 
 #: ../src/ui.vala:1703
 msgid "Quit"
-msgstr ""
+msgstr "Quitar"
 
 #. Button in error infobar to open preferences dialog and change scanner
 #: ../src/ui.vala:1737