Merge tag 'upstream/3.19.3'

Upstream version 3.19.3

1 files changed, 17 insertions, 11 deletions

diff --git a/po/de.po b/po/de.po
index 342aabe..7f29e51 100644
--- a/po/de.po
+++ b/po/de.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-09-29 11:41+1300\n"
+"POT-Creation-Date: 2015-11-27 09:10+1300\n"
 "PO-Revision-Date: 2015-01-16 18:30+0000\n"
 "Last-Translator: Tobias Bannert <Unknown>\n"
 "Language-Team: German <de@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-10-20 05:15+0000\n"
-"X-Generator: Launchpad (build 17812)\n"
+"X-Launchpad-Export-Date: 2015-11-27 05:13+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -426,22 +426,22 @@ msgstr ""
 "meisten verfügbaren Scanner."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:840
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Keine Scanner verfügbar. Bitte schließen Sie einen Scanner an."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:870
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Verbindung zum Scanner konnte nicht hergestellt werden"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1222
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Scanvorgang konnte nicht gestartet werden"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1235 ../src/scanner.vala:1332
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Fehler bei der Kommunikation mit dem Scanner"
 
@@ -698,6 +698,7 @@ msgstr ""
 "  Steve G. https://launchpad.net/~sgo.ger\n"
 "  Thomas Heidrich https://launchpad.net/~gnuheidix\n"
 "  Tobias Bannert https://launchpad.net/~toba\n"
+"  Torsten Franz https://launchpad.net/~torsten.franz\n"
 "  UweS https://launchpad.net/~uwes\n"
 "  Webschiff https://launchpad.net/~webschiff\n"
 "  William Glover https://launchpad.net/~williamglover\n"
@@ -758,10 +759,8 @@ msgstr "Scheinbar ist ein Epson Scanner angeschlossen."
 #: ../src/ui.vala:1599
 msgid ""
 "Drivers for this are available on the <a "
-"href=\"http://support.epsom.com\">Epson website</a>."
+"href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
-"Treiber hierfür sind verfügbar auf der <a "
-"href=\"http://support.epsom.com\">Epson Webseite</a>."
 
 #. Title of dialog giving instructions on how to install drivers
 #: ../src/ui.vala:1603
@@ -798,7 +797,7 @@ msgstr "Treiberinstallation fehlgeschlagen."
 #: ../src/ui.vala:1677
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "Sie müssen %s Paket(e) installieren."
 
 #. Preferences dialog: Label for default resolution in resolution list
 #: ../src/ui.vala:1775
@@ -1025,3 +1024,10 @@ msgstr "Seite %d von %d wird gespeichert"
 
 #~ msgid "Select File _Type"
 #~ msgstr "_Dateityp auswählen"
+
+#~ msgid ""
+#~ "Drivers for this are available on the <a "
+#~ "href=\"http://support.epsom.com\">Epson website</a>."
+#~ msgstr ""
+#~ "Treiber hierfür sind verfügbar auf der <a "
+#~ "href=\"http://support.epson.com\">Epson Webseite</a>."