[simple-scan/gnome-3-18: 4/6] Fix typo in Epson website

From: Robert Ancell <rancell src gnome org>
To: commits-list gnome org
Cc:
Subject: [simple-scan/gnome-3-18: 4/6] Fix typo in Epson website
Date: Thu, 27 Apr 2017 09:09:07 +0000 (UTC)
commit f8f16f7a37f83d46502db9bc3463282de464acea
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Nov 27 09:15:55 2015 +1300

    Fix typo in Epson website

 po/simple-scan.pot |  257 +++++++++++++++++++++++++++++++++++-----------------
 src/ui.vala        |    2 +-
 2 files changed, 174 insertions(+), 85 deletions(-)
---
diff --git a/po/simple-scan.pot b/po/simple-scan.pot
index ecb714d..75bb893 100644
--- a/po/simple-scan.pot
+++ b/po/simple-scan.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"POT-Creation-Date: 2015-11-27 09:15+1300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL li org>\n"
@@ -49,7 +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
+#: ../data/appdata/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
 msgid "Save"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
 msgid "Preferences"
 msgstr ""
 
@@ -304,18 +304,6 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../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
 msgid "Device to scan from"
 msgstr ""
@@ -411,6 +399,18 @@ msgstr ""
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
+#: ../data/appdata/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/appdata/simple-scan.appdata.xml.in.h:3
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
@@ -446,150 +446,156 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.vala:316
-msgid "Scanned Document"
-msgstr ""
-
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:541
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:552
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: ../src/ui.vala:316 ../src/ui.vala:1735
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:381
+msgid "Additional software needed"
+msgstr ""
+
+#. Instructions to install driver software
+#: ../src/ui.vala:383
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1691
+#: ../src/ui.vala:505 ../src/ui.vala:1834
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
+msgid "Scanned Document.pdf"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
-#.
-#: ../src/ui.vala:532
-msgid "Select File _Type"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:556
+msgid "File format:"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../src/ui.vala:1471
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -606,120 +612,203 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1580
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1582
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com";
+"\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1586
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1588
+msgid ""
+"Drivers for this are available on the <a href=\"http://samsung.com/support";
+"\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1592
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1597
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1599
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.epson.com";
+"\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1603
+msgid "Install drivers"
+msgstr ""
+
+#. Message in driver install dialog
+#: ../src/ui.vala:1634
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: ../src/ui.vala:1646
+msgid "Installing drivers..."
+msgstr ""
+
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1654
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1664
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1670
+msgid "Failed to install drivers."
+msgstr ""
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1677
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1781
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1683
+#: ../src/ui.vala:1826
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1831
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1835
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1836
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1701
+#: ../src/ui.vala:1844
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1702
+#: ../src/ui.vala:1845
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1703
+#: ../src/ui.vala:1846
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1737
+#: ../src/ui.vala:1880
 msgid "Change _Scanner"
 msgstr ""
 
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1882
+msgid "_Install Drivers"
+msgstr ""
+
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1743
+#: ../src/ui.vala:1888
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1793
+#: ../src/ui.vala:1938
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1795
+#: ../src/ui.vala:1940
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1948
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1950
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1958
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1960
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1856
+#: ../src/ui.vala:1994
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2019
+#: ../src/ui.vala:2157
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/src/ui.vala b/src/ui.vala
index a66db50..c16ab60 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -1596,7 +1596,7 @@ public class UserInterface : Gtk.ApplicationWindow
             /* Message to indicate an Epson scanner has been detected */
             message = _("You appear to have an Epson scanner.");
             /* Instructions on how to install Epson scanner drivers */
-            instructions = _("Drivers for this are available on the <a 
href=\"http://support.epsom.com\";>Epson website</a>.");
+            instructions = _("Drivers for this are available on the <a 
href=\"http://support.epson.com\";>Epson website</a>.");
             break;
         }
         var dialog = new Gtk.Dialog.with_buttons (/* Title of dialog giving instructions on how to install 
drivers */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]