GNOME.org
 

[simple-scan] Rename to "Document Scanner"

commit cdb77e83ff86b228383c2ca383709d48db2dc44d
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Aug 2 13:33:36 2019 -0400

    Rename to "Document Scanner"
    
    Fixes #95

 README.md                       | 15 +++++++--------
 data/simple-scan.1              |  4 ++--
 data/simple-scan.appdata.xml.in |  4 ++--
 data/simple-scan.desktop.in     |  3 +--
 help/C/crop.page                |  2 +-
 help/C/index.page               |  2 +-
 help/C/print.page               |  5 ++---
 help/C/rotate.page              |  2 +-
 help/C/scanner.page             |  7 ++++---
 help/C/scanning.page            |  2 +-
 simple-scan.doap                |  2 +-
 snap/snapcraft.yaml             |  2 +-
 src/app-window.ui               |  2 +-
 src/app-window.vala             | 10 +++++-----
 src/simple-scan.vala            |  4 ++--
 15 files changed, 32 insertions(+), 34 deletions(-)
---
diff --git a/README.md b/README.md
index 478300d..a6ee6dc 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,9 @@
 
 # Introduction
 
-This is the source code to *Simple Scan* — a [GNOME](https://www.gnome.org/)
-document scanning application. Simple Scan allows you to capture images using
-[image scanners](https://en.wikipedia.org/wiki/Image_scanner) (e.g. flatbed
-scanners) that have suitable [SANE drivers](http://sane-project.org/) installed.
+*Document Scanner* is a document scanning application for [GNOME](https://www.gnome.org/)
+It allows you to capture images using [image scanners](https://en.wikipedia.org/wiki/Image_scanner)
+(e.g. flatbed scanners) that have suitable [SANE drivers](http://sane-project.org/) installed.
 
 # Building from source
 
@@ -45,11 +44,11 @@ If you don't have a scanner ready, you can use a virtual "test" scanner:
 $ simple-scan --debug test
 ```
 
-Simple Scan works by using the [SANE API](http://sane-project.org/html/) to
+This app works by using the [SANE API](http://sane-project.org/html/) to
 capture images. It chooses the settings it thinks are appropriate for what you
 are trying to do. Drivers have many options and are of differring quality - it
-is useful to work out if any issues are caused by Simple Scan or the drivers. To
-rule out Simple Scan you can use the graphical tool (XSane) or the
+is useful to work out if any issues are caused by the app or the drivers. To
+confirm it is a driver issue you can use the graphical tool (XSane) or the
 command line
 [scanimage](http://www.sane-project.org/man/scanimage.1.html) provided
 by the SANE project - these allow to to easily see and control all the
@@ -57,6 +56,6 @@ settings your driver provides.
 
 # Contributing
 
-To contribute code to Simple Scan make merge requests on
+To contribute code create merge requests on
 [gitlab.gnome.org](https://gitlab.gnome.org/GNOME/simple-scan). If you
 find issues please [report them](https://gitlab.gnome.org/GNOME/simple-scan/issues).
diff --git a/data/simple-scan.1 b/data/simple-scan.1
index d562b97..1a8d4f6 100644
--- a/data/simple-scan.1
+++ b/data/simple-scan.1
@@ -27,11 +27,11 @@ command.
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics,
 .\" respectively.
-.B Simple Scan
+.B Document Scanner
 is an easy-to-use application, designed to let users connect their
 scanner and quickly have the image/document in an appropriate format.
 .PP
-.B Simple Scan
+.B Document Scanner
 has been written with GTK+ libraries, and after installing the
 application you can run it from the
 .B Applications
diff --git a/data/simple-scan.appdata.xml.in b/data/simple-scan.appdata.xml.in
index e317402..67de251 100644
--- a/data/simple-scan.appdata.xml.in
+++ b/data/simple-scan.appdata.xml.in
@@ -3,7 +3,7 @@
   <id>simple-scan.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+ and CC-BY-SA-3.0</project_license>
-  <name>Simple Scan</name>
+  <name>Document Scanner</name>
   <summary>Scan Documents</summary>
   <description>
     <p>
@@ -12,7 +12,7 @@
       You can print your scans, export them to pdf, or save them in a range of image formats.
     </p>
     <p>
-      Simple Scan uses the SANE framework to support most existing scanners.
+      This app uses the SANE framework to support most existing scanners.
     </p>
   </description>
   <screenshots>
diff --git a/data/simple-scan.desktop.in b/data/simple-scan.desktop.in
index 2e602af..739c192 100644
--- a/data/simple-scan.desktop.in
+++ b/data/simple-scan.desktop.in
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Name=Simple Scan
-GenericName=Document Scanner
+Name=Document Scanner
 Comment=Scan Documents
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=scan;scanner;flatbed;adf;
diff --git a/help/C/crop.page b/help/C/crop.page
index ab0bf64..69ca197 100644
--- a/help/C/crop.page
+++ b/help/C/crop.page
@@ -9,7 +9,7 @@
        <title>Cropping</title>
 
     <p>
-    The cropping feature in <app>Simple Scan</app> allows you to use only a part of a scanned image. You can
+    The cropping feature allows you to use only a part of a scanned image. You can
     enable crop either before or after scanning a page, and you can always change the dimensions of the crop
     frame. When crop is enabled, a mask will appear over the current page with the area not being used shown
     in gray. You can enable crop and choose the desired dimensions via one of the following methods:
diff --git a/help/C/index.page b/help/C/index.page
index 7a57726..2c734e5 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -14,7 +14,7 @@
                <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"; />
        </info>
 
-       <title><media type="image" src="figures/icon.svg" height="32px"/> Simple Scan Manual</title>
+       <title><media type="image" src="figures/icon.svg" height="32px"/>Document Scanner Manual</title>
 
     <section id="acquire" style="2column">
         <title>Scanning Pages</title>
diff --git a/help/C/print.page b/help/C/print.page
index 5c7794a..9726bee 100644
--- a/help/C/print.page
+++ b/help/C/print.page
@@ -9,9 +9,8 @@
        <title>Printing</title>
 
     <p>
-    <app>Simple Scan</app> allows you print a scanned document directly from the its
-    interface, without having to save the document first. This feature makes <app>Simple
-    Scan</app> a very convenient tool for making copies of documents or photos. 
+    You are able to print a scanned document directly without having to save
+    the document first. This is convenient for making copies of documents or photos.
     </p>
     <steps>
       <title>To Print a Document</title>
diff --git a/help/C/rotate.page b/help/C/rotate.page
index b64c69f..3dc7508 100644
--- a/help/C/rotate.page
+++ b/help/C/rotate.page
@@ -9,7 +9,7 @@
        <title>Rotating a Page</title>
 
     <p>
-    In <app>Simple Scan</app>, you can change the rotation of a page either before or after scanning the 
page.
+    You can change the rotation of a page either before or after scanning the page.
     Currently, there are four ways to rotate a page: 
     </p>
     
diff --git a/help/C/scanner.page b/help/C/scanner.page
index 3762cc1..efcbb0f 100644
--- a/help/C/scanner.page
+++ b/help/C/scanner.page
@@ -13,8 +13,9 @@
     </p>
     <media type="image" src="figures/preferences.png"/>
     <p>
-    Your local scanners are automatically detected each time you start <app>Simple Scan</app>
-    and each time you plug in a USB scanner. If you connect a network scanner while <app>Simple Scan</app>
-    is running, you will need to restart <app>Simple Scan</app> for the scanner to be detected.
+    Local scanners are automatically detected each time <app>Document Scanner</app>
+    starts and each time you plug in a USB scanner. If you connect a network
+    scanner you will need to restart <app>Document Scanner</app> for the scanner
+    to be detected.
     </p>
 </page>
diff --git a/help/C/scanning.page b/help/C/scanning.page
index c48a99d..a106dc8 100644
--- a/help/C/scanning.page
+++ b/help/C/scanning.page
@@ -14,7 +14,7 @@
     </p>
     <steps>
       <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Open <app>Simple Scan</app>.</p></item>
+      <item><p>Open <app>Document Scanner</app>.</p></item>
       <item><p>Click the arrow to the right of the "Scan" button and choose the type
             of document you are scanning: <em>Photo</em> or <em>Text</em>.</p>
             <media type="image" src="figures/scan_toolbar.png"/></item>
diff --git a/simple-scan.doap b/simple-scan.doap
index 81a1fd5..8b7a2f4 100644
--- a/simple-scan.doap
+++ b/simple-scan.doap
@@ -7,7 +7,7 @@
   <name xml:lang="en">simple-scan</name>
   <shortdesc xml:lang="en">Document Scanning Application</shortdesc>
   <description xml:lang="en">
-   Simple Scan allows you to get images from a scanner (e.g. a flatbed scanner).
+   A really easy way to scan both documents and photos from a scanner (e.g. a flatbed scanner).
   </description>
   <homepage rdf:resource="https://gitlab.gnome.org/GNOME/simple-scan"; />
   <download-page rdf:resource="https://download.gnome.org/sources/simple-scan/"; />
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 3e3d92d..3697500 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -2,7 +2,7 @@ name: simple-scan
 version: git
 summary: Document Scanning Application
 description: |
-  Simple Scan allows you to get images from a scanner (e.g. a flatbed scanner)
+  A really easy way to scan both documents and photos from a scanner (e.g. a flatbed scanner).
 
 grade: stable # must be 'stable' to release into candidate/stable channels
 confinement: strict
diff --git a/src/app-window.ui b/src/app-window.ui
index fbde173..b34c07e 100644
--- a/src/app-window.ui
+++ b/src/app-window.ui
@@ -178,7 +178,7 @@
     </child>
   </object>
   <template class="AppWindow" parent="GtkApplicationWindow">
-    <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
+    <property name="title" translatable="yes" comments="Title of scan window">Document Scanner</property>
     <property name="icon_name">org.gnome.SimpleScan</property>
     <signal name="delete-event" handler="window_delete_event_cb" swapped="no"/>
     <child>
diff --git a/src/app-window.vala b/src/app-window.vala
index 53bb77e..7901cd7 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -1292,14 +1292,14 @@ public class AppWindow : Gtk.ApplicationWindow
         string license = _("This program is free software: you can redistribute it and/or modify\nit under 
the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 
of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it 
will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS 
FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received 
a copy of the GNU General Public License\nalong with this program.  If not, see 
<http://www.gnu.org/licenses/>.");
 
         /* Title of about dialog */
-        string title = _("About Simple Scan");
+        string title = _("About Document Scanner");
 
         /* Description of program */
         string description = _("Simple document scanning tool");
 
         Gtk.show_about_dialog (this,
                                "title", title,
-                               "program-name", _("Simple Scan"),
+                               "program-name", _("Document Scanner"),
                                "version", VERSION,
                                "comments", description,
                                "logo-icon-name", "org.gnome.SimpleScan",
@@ -1419,7 +1419,7 @@ public class AppWindow : Gtk.ApplicationWindow
         instructions_box.add (instructions_label);
 
         label = new Gtk.Label (/* Message in driver install dialog */
-                               _("Once installed you will need to restart Simple Scan."));
+                               _("Once installed you will need to restart this app."));
         label.visible = true;
         label.xalign = 0f;
         label.vexpand = true;
@@ -1553,7 +1553,7 @@ public class AppWindow : Gtk.ApplicationWindow
         /* Set HeaderBar title here because Glade doesn't keep it translated */
         /* https://bugzilla.gnome.org/show_bug.cgi?id=782753 */
         /* Title of scan window */
-        header_bar.title = _("Simple Scan");
+        header_bar.title = _("Document Scanner");
 
         app.add_action_entries (action_entries, this);
 
@@ -1578,7 +1578,7 @@ public class AppWindow : Gtk.ApplicationWindow
         section.append (_("Preferences"), "app.preferences");
         section.append (_("Keyboard Shortcuts"), "win.show-help-overlay");
         section.append (_("Help"), "app.help");
-        section.append (_("About Simple Scan"), "app.about");
+        section.append (_("About Document Scanner"), "app.about");
         menu_button.set_menu_model (gear_menu);
 
         app.add_window (this);
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index 0c263f0..6175a8e 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -23,7 +23,7 @@ public class SimpleScan : Gtk.Application
           /* Help string for command line --debug flag */
           N_("Print debugging messages"), null},
         { "fix-pdf", 0, 0, OptionArg.STRING, ref fix_pdf_filename,
-          N_("Fix PDF files generated with older versions of Simple Scan"), "FILENAME…"},
+          N_("Fix PDF files generated with older versions of this app"), "FILENAME…"},
         { null }
     };
     private static Timer log_timer;
@@ -635,7 +635,7 @@ public class SimpleScan : Gtk.Application
         log_file = FileStream.open (path, "w");
         Log.set_default_handler (log_cb);
 
-        debug ("Starting Simple Scan %s, PID=%i", VERSION, Posix.getpid ());
+        debug ("Starting %s %s, PID=%i", args[0], VERSION, Posix.getpid ());
 
         Gtk.init (ref args);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]