[shotwell] Remove double spaces from translatable strings

[Jens Georg <jensgeorg src gnome org>]

commit 7ee95d4059c6f4ec8b5ee1583a73864d8b412540
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Sun Oct 2 18:17:47 2016 +0200

    Remove double spaces from translatable strings
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772339

 plugins/shotwell-publishing/FlickrPublishing.vala |    2 +-
 src/AppWindow.vala                                |    2 +-
 src/Dialogs.vala                                  |   26 ++++++++++----------
 src/Exporter.vala                                 |    2 +-
 src/camera/ImportPage.vala                        |    6 ++--
 src/main.vala                                     |    6 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala 
b/plugins/shotwell-publishing/FlickrPublishing.vala
index af3ddbc..c214ce9 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.vala
+++ b/plugins/shotwell-publishing/FlickrPublishing.vala
@@ -57,7 +57,7 @@ namespace Publishing.Flickr {
 
 internal const string SERVICE_NAME = "Flickr";
 internal const string SERVICE_WELCOME_MESSAGE = 
-    _("You are not currently logged into Flickr.\n\nClick Log in to log into Flickr in your Web browser.  
You will have to authorize Shotwell Connect to link to your Flickr account.");
+    _("You are not currently logged into Flickr.\n\nClick Log in to log into Flickr in your Web browser. You 
will have to authorize Shotwell Connect to link to your Flickr account.");
 internal const string RESTART_ERROR_MESSAGE = 
     _("You have already logged in and out of Flickr during this Shotwell session.\nTo continue publishing to 
Flickr, quit and restart Shotwell, then try publishing again.");
 internal const string ENDPOINT_URL = "https://api.flickr.com/services/rest";;
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index f99908c..0103300 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -653,7 +653,7 @@ public abstract class AppWindow : PageWindow {
     }
     
     public static void database_error(DatabaseError err) {
-        panic(_("A fatal error occurred when accessing Shotwell’s library.  Shotwell cannot 
continue.\n\n%s").printf(
+        panic(_("A fatal error occurred when accessing Shotwell’s library. Shotwell cannot 
continue.\n\n%s").printf(
             err.message));
     }
     
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index 739cff4..2ec2679 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -13,8 +13,8 @@ public bool confirm_delete_tag(Tag tag) {
     if (count == 0)
         return true;
     string msg = ngettext(
-        "This will remove the tag “%s” from one photo.  Continue?",
-        "This will remove the tag “%s” from %d photos.  Continue?",
+        "This will remove the tag “%s” from one photo. Continue?",
+        "This will remove the tag “%s” from %d photos. Continue?",
         count).printf(tag.get_user_visible_name(), count);
     
     return AppWindow.negate_affirm_question(msg, _("_Cancel"), _("_Delete"),
@@ -22,7 +22,7 @@ public bool confirm_delete_tag(Tag tag) {
 }
 
 public bool confirm_delete_saved_search(SavedSearch search) {
-    string msg = _("This will remove the saved search “%s”.  Continue?")
+    string msg = _("This will remove the saved search “%s”. Continue?")
         .printf(search.get_name());
     
     return AppWindow.negate_affirm_question(msg, _("_Cancel"), _("_Delete"),
@@ -1414,8 +1414,8 @@ public bool revert_editable_dialog(Gtk.Window owner, Gee.Collection<Photo> photo
            
     string headline = (count == 1) ? _("Revert External Edit?") : _("Revert External Edits?");
     string msg = ngettext(
-        "This will destroy all changes made to the external file.  Continue?",
-        "This will destroy all changes made to %d external files.  Continue?",
+        "This will destroy all changes made to the external file. Continue?",
+        "This will destroy all changes made to %d external files. Continue?",
         count).printf(count);
 
     string action = (count == 1) ? _("Re_vert External Edit") : _("Re_vert External Edits");
@@ -1439,8 +1439,8 @@ public bool remove_offline_dialog(Gtk.Window owner, int count) {
         return false;
     
     string msg = ngettext(
-        "This will remove the photo from the library.  Continue?",
-        "This will remove %d photos from the library.  Continue?",
+        "This will remove the photo from the library. Continue?",
+        "This will remove %d photos from the library. Continue?",
         count).printf(count);
     
     Gtk.MessageDialog dialog = new Gtk.MessageDialog(owner, Gtk.DialogFlags.MODAL,
@@ -2716,16 +2716,16 @@ public void remove_from_app(Gee.Collection<MediaSource> sources, string dialog_t
     
     string? user_message = null;
     if ((!photos.is_empty) && (!videos.is_empty)) {
-        user_message = ngettext("This will remove the photo/video from your Shotwell library.  Would you 
also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
-            "This will remove %d photos/videos from your Shotwell library.  Would you also like to move the 
files to your desktop trash?\n\nThis action cannot be undone.",
+        user_message = ngettext("This will remove the photo/video from your Shotwell library. Would you also 
like to move the file to your desktop trash?\n\nThis action cannot be undone.",
+            "This will remove %d photos/videos from your Shotwell library. Would you also like to move the 
files to your desktop trash?\n\nThis action cannot be undone.",
              sources.size).printf(sources.size);
     } else if (!videos.is_empty) {
-        user_message = ngettext("This will remove the video from your Shotwell library.  Would you also like 
to move the file to your desktop trash?\n\nThis action cannot be undone.",
-            "This will remove %d videos from your Shotwell library.  Would you also like to move the files 
to your desktop trash?\n\nThis action cannot be undone.",
+        user_message = ngettext("This will remove the video from your Shotwell library. Would you also like 
to move the file to your desktop trash?\n\nThis action cannot be undone.",
+            "This will remove %d videos from your Shotwell library. Would you also like to move the files to 
your desktop trash?\n\nThis action cannot be undone.",
              sources.size).printf(sources.size);
     } else {
-        user_message = ngettext("This will remove the photo from your Shotwell library.  Would you also like 
to move the file to your desktop trash?\n\nThis action cannot be undone.",
-            "This will remove %d photos from your Shotwell library.  Would you also like to move the files 
to your desktop trash?\n\nThis action cannot be undone.",
+        user_message = ngettext("This will remove the photo from your Shotwell library. Would you also like 
to move the file to your desktop trash?\n\nThis action cannot be undone.",
+            "This will remove %d photos from your Shotwell library. Would you also like to move the files to 
your desktop trash?\n\nThis action cannot be undone.",
              sources.size).printf(sources.size);
     }
     
diff --git a/src/Exporter.vala b/src/Exporter.vala
index 221ba73..b9596f5 100644
--- a/src/Exporter.vala
+++ b/src/Exporter.vala
@@ -314,7 +314,7 @@ public class ExporterUI {
     
     private Exporter.Overwrite on_export_overwrite(Exporter exporter, File file) {
         progress_dialog.set_modal(false);
-        string question = _("File %s already exists.  Replace?").printf(file.get_basename());
+        string question = _("File %s already exists. Replace?").printf(file.get_basename());
         Gtk.ResponseType response = AppWindow.negate_affirm_all_cancel_question(question, 
             _("_Skip"), _("_Replace"), _("Replace _All"), _("Export"));
         
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 0ad287c..db48634 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -455,7 +455,7 @@ public class CameraAccumulator : Object, Core.TrackerAccumulator {
 }
 
 public class ImportPage : CheckerboardPage {
-    private const string UNMOUNT_FAILED_MSG = _("Unable to unmount camera.  Try unmounting the camera from 
the file manager.");
+    private const string UNMOUNT_FAILED_MSG = _("Unable to unmount camera. Try unmounting the camera from 
the file manager.");
     
     private class ImportViewManager : ViewManager {
         private ImportPage owner;
@@ -1010,7 +1010,7 @@ public class ImportPage : CheckerboardPage {
                 
                 if (mount != null) {
                     // it's mounted, offer to unmount for the user
-                    string mounted_message = _("Shotwell needs to unmount the camera from the filesystem in 
order to access it.  Continue?");
+                    string mounted_message = _("Shotwell needs to unmount the camera from the filesystem in 
order to access it. Continue?");
 
                     Gtk.MessageDialog dialog = new Gtk.MessageDialog(AppWindow.get_instance(), 
                         Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION,
@@ -1026,7 +1026,7 @@ public class ImportPage : CheckerboardPage {
                         unmount_camera(mount);
                     }
                 } else {
-                    string locked_message = _("The camera is locked by another application.  Shotwell can 
only access the camera when it’s unlocked.  Please close any other application using the camera and try 
again.");
+                    string locked_message = _("The camera is locked by another application. Shotwell can 
only access the camera when it’s unlocked. Please close any other application using the camera and try 
again.");
 
                     // it's not mounted, so another application must have it locked
                     Gtk.MessageDialog dialog = new Gtk.MessageDialog(AppWindow.get_instance(),
diff --git a/src/main.vala b/src/main.vala
index 7de0059..6941734 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -51,18 +51,18 @@ void library_exec(string[] mounts) {
         break;
         
         case Db.VerifyResult.FUTURE_VERSION:
-            errormsg = _("Your photo library is not compatible with this version of Shotwell.  It appears it 
was created by Shotwell %s (schema %d).  This version is %s (schema %d).  Please use the latest version of 
Shotwell.").printf(
+            errormsg = _("Your photo library is not compatible with this version of Shotwell. It appears it 
was created by Shotwell %s (schema %d). This version is %s (schema %d). Please use the latest version of 
Shotwell.").printf(
                 app_version, schema_version, Resources.APP_VERSION, DatabaseTable.SCHEMA_VERSION);
         break;
         
         case Db.VerifyResult.UPGRADE_ERROR:
-            errormsg = _("Shotwell was unable to upgrade your photo library from version %s (schema %d) to 
%s (schema %d).  For more information please check the Shotwell Wiki at %s").printf(
+            errormsg = _("Shotwell was unable to upgrade your photo library from version %s (schema %d) to 
%s (schema %d). For more information please check the Shotwell Wiki at %s").printf(
                 app_version, schema_version, Resources.APP_VERSION, DatabaseTable.SCHEMA_VERSION,
                 Resources.HOME_URL);
         break;
         
         case Db.VerifyResult.NO_UPGRADE_AVAILABLE:
-            errormsg = _("Your photo library is not compatible with this version of Shotwell.  It appears it 
was created by Shotwell %s (schema %d).  This version is %s (schema %d).  Please clear your library by 
deleting %s and re-import your photos.").printf(
+            errormsg = _("Your photo library is not compatible with this version of Shotwell. It appears it 
was created by Shotwell %s (schema %d). This version is %s (schema %d). Please clear your library by deleting 
%s and re-import your photos.").printf(
                 app_version, schema_version, Resources.APP_VERSION, DatabaseTable.SCHEMA_VERSION,
                 AppDirs.get_data_dir().get_path());
         break;