[gnome-screensaver] Miscellaneous string fixes

[William Jon McCann <mccann src gnome org>]

commit ee83caaaec4a5239f1d5ab3f4f74bdfd2f7957fe
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Feb 24 23:22:57 2010 +0000

    Miscellaneous string fixes
    
    Various small grammar, capitalisation and punctuation fixes, including
    converting gnome-screensaver to use proper Unicode ellipses.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=611023

 data/gnome-screensaver.schemas.in   |   12 ++++++------
 savers/floaters.c                   |    2 +-
 savers/slideshow.c                  |    2 +-
 src/gnome-screensaver-dialog.c      |   10 +++++-----
 src/gnome-screensaver.desktop.in.in |    2 +-
 src/gs-lock-plug.c                  |    2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/data/gnome-screensaver.schemas.in b/data/gnome-screensaver.schemas.in
index 6198d5d..485c4ea 100644
--- a/data/gnome-screensaver.schemas.in
+++ b/data/gnome-screensaver.schemas.in
@@ -90,11 +90,11 @@
       <type>int</type>
       <default>30</default>
       <locale name="C">
-        <short>Time before power-management baseline</short>
+        <short>Time before power management baseline</short>
         <long>
           The number of seconds of inactivity before signalling
-          to power-management.  This key is set and maintained
-          by the session power-management agent.
+          to power management.  This key is set and maintained
+          by the session power management agent.
         </long>
       </locale>
      </schema>
@@ -171,8 +171,8 @@
       <locale name="C">
         <short>Allow logout</short>
         <long>
-          Set this to TRUE to offer an option in unlock dialog to
-          logging out after a delay.  The Delay is specified in the
+          Set this to TRUE to offer an option in the unlock dialog to
+          allow logging out after a delay.  The delay is specified in the
           "logout_delay" key.
         </long>
       </locale>
@@ -188,7 +188,7 @@
         <short>Time before logout option</short>
         <long>
           The number of minutes after the screensaver activation
-          before a logout option will appear in unlock dialog. This
+          before a logout option will appear in the unlock dialog. This
           key has effect only if the "logout_enable" key is set to TRUE.
         </long>
       </locale>
diff --git a/savers/floaters.c b/savers/floaters.c
index 9587357..04c49ad 100644
--- a/savers/floaters.c
+++ b/savers/floaters.c
@@ -1195,7 +1195,7 @@ main (int   argc,
                       /* translators: the word "image" here
                        * represents a command line argument
                        */
-                      _("image - floats images around the screen"),
+                      _("image â?? floats images around the screen"),
                       options, GETTEXT_PACKAGE, &error);
 
 
diff --git a/savers/slideshow.c b/savers/slideshow.c
index 1d856e6..b188155 100644
--- a/savers/slideshow.c
+++ b/savers/slideshow.c
@@ -52,7 +52,7 @@ main (int argc, char **argv)
                 { "location", 0, 0, G_OPTION_ARG_STRING, &location,
                   N_("Location to get images from"), N_("PATH") },
                 { "background-color", 0, 0, G_OPTION_ARG_STRING, &background_color,
-                  N_("Color to use for images background"), N_("\"#rrggbb\"") },
+                  N_("Color to use for image background"), N_("\"#rrggbb\"") },
                 { "sort-images", 0, 0, G_OPTION_ARG_NONE, &sort_images,
                   N_("Do not randomize pictures from location"), NULL },
                 { "no-stretch", 0, 0, G_OPTION_ARG_NONE, &no_stretch,
diff --git a/src/gnome-screensaver-dialog.c b/src/gnome-screensaver-dialog.c
index 9d72fcb..09cde37 100644
--- a/src/gnome-screensaver-dialog.c
+++ b/src/gnome-screensaver-dialog.c
@@ -186,10 +186,10 @@ maybe_translate_message (const char *msg)
                 g_hash_table_insert (hash, "Your account has expired; please contact your system administrator", _("Your account has expired; please contact your system administrator"));
                 g_hash_table_insert (hash, "No password supplied", _("No password supplied"));
                 g_hash_table_insert (hash, "Password unchanged", _("Password unchanged"));
-                g_hash_table_insert (hash, "Can not get username", _("Can not get username"));
-                g_hash_table_insert (hash, "Retype new UNIX password:", _("Retype new UNIX password:"));
-                g_hash_table_insert (hash, "Enter new UNIX password:", _("Enter new UNIX password:"));
-                g_hash_table_insert (hash, "(current) UNIX password:", _("(current) UNIX password:"));
+                g_hash_table_insert (hash, "Can not get username", _("Cannot get username"));
+                g_hash_table_insert (hash, "Retype new UNIX password:", _("Retype new Unix password:"));
+                g_hash_table_insert (hash, "Enter new UNIX password:", _("Enter new Unix password:"));
+                g_hash_table_insert (hash, "(current) UNIX password:", _("(current) Unix password:"));
                 g_hash_table_insert (hash, "Error while changing NIS password.", _("Error while changing NIS password."));
                 g_hash_table_insert (hash, "You must choose a longer password", _("You must choose a longer password"));
                 g_hash_table_insert (hash, "Password has been already used. Choose another.", _("Password has been already used. Choose another."));
@@ -260,7 +260,7 @@ auth_message_handler (GSAuthMessageStyle style,
                 gs_debug ("Got no response");
                 ret = FALSE;
         } else {
-                gs_lock_plug_show_message (plug, _("Checking..."));
+                gs_lock_plug_show_message (plug, _("Checkingâ?¦"));
                 gs_lock_plug_set_sensitive (plug, FALSE);
         }
 
diff --git a/src/gnome-screensaver.desktop.in.in b/src/gnome-screensaver.desktop.in.in
index db5e09b..82d6d6f 100644
--- a/src/gnome-screensaver.desktop.in.in
+++ b/src/gnome-screensaver.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 _Name=Screensaver
-_Comment=Launch screen saver and locker program
+_Comment=Launch screensaver and locker program
 Icon=preferences-desktop-screensaver
 Exec=gnome-screensaver
 OnlyShowIn=GNOME;
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index dde2bcd..da7d30c 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -1267,7 +1267,7 @@ create_page_one_buttons (GSLockPlug *plug)
 
         plug->priv->auth_switch_button =  gs_lock_plug_add_button (GS_LOCK_PLUG (plug),
                                                                    plug->priv->auth_action_area,
-                                                                   _("S_witch User..."));
+                                                                   _("S_witch Userâ?¦"));
         gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (plug->priv->auth_action_area),
                                             plug->priv->auth_switch_button,
                                             TRUE);