[accounts-dialog] Miscellaneous string fixes

[Philip Withnall <pwithnall src gnome org>]

commit 8ba389216833c1383deb508c503c20f1c46acd30
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Mar 6 11:44:58 2010 +0000

    Miscellaneous string fixes

 data/password-dialog.ui      |    2 +-
 data/user-accounts-dialog.ui |    2 +-
 src/fingerprint-strings.h    |    6 +++---
 src/main.c                   |    4 ++--
 src/um-account-dialog.c      |    2 +-
 src/um-fingerprint-dialog.c  |    2 +-
 src/um-password-dialog.c     |    2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/data/password-dialog.ui b/data/password-dialog.ui
index 000aa4b..c7f0bf9 100644
--- a/data/password-dialog.ui
+++ b/data/password-dialog.ui
@@ -19,7 +19,7 @@
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Login without a password</col>
+        <col id="0" translatable="yes">Log in without a password</col>
         <col id="1">2</col>
       </row>
       <row>
diff --git a/data/user-accounts-dialog.ui b/data/user-accounts-dialog.ui
index 409b718..8120c1f 100644
--- a/data/user-accounts-dialog.ui
+++ b/data/user-accounts-dialog.ui
@@ -807,7 +807,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="dm-show-power-buttons-checkbutton">
-                    <property name="label" translatable="yes">Show Shutdown, Suspend, and Restart actions</property>
+                    <property name="label" translatable="yes">Show Shutdown, Suspend and Restart actions</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
diff --git a/src/fingerprint-strings.h b/src/fingerprint-strings.h
index d1b919e..6fb7cb3 100644
--- a/src/fingerprint-strings.h
+++ b/src/fingerprint-strings.h
@@ -74,11 +74,11 @@ static const char *verify_result_str_to_msg(const char *result, gboolean is_swip
 			return N_("Swipe your finger again");
 	}
 	if (strcmp (result, "verify-swipe-too-short") == 0)
-		return N_("Swipe was too short, try again");
+		return N_("Swipe was too short; try again");
 	if (strcmp (result, "verify-finger-not-centered") == 0)
-		return N_("Your finger was not centered, try swiping your finger again");
+		return N_("Your finger was not centered; try swiping your finger again");
 	if (strcmp (result, "verify-remove-and-retry") == 0)
-		return N_("Remove your finger, and try swiping your finger again");
+		return N_("Remove your finger and try swiping it again");
 
 	return NULL;
 }
diff --git a/src/main.c b/src/main.c
index 5469214..ab1eaa3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -408,7 +408,7 @@ delete_user (GtkButton *button, UserAccountDialog *d)
                                                 um_user_get_real_name (user));
 
                 gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                          _("Deleting a user while he is logged in can leave the system in an inconsistent state."));
+                                                          _("Deleting a user while they are logged in can leave the system in an inconsistent state."));
                 g_signal_connect (dialog, "response",
                                   G_CALLBACK (gtk_widget_destroy), NULL);
         }
@@ -417,7 +417,7 @@ delete_user (GtkButton *button, UserAccountDialog *d)
                                                  0,
                                                  GTK_MESSAGE_QUESTION,
                                                  GTK_BUTTONS_NONE,
-                                                 _("Do you want to keep %s's files ?"),
+                                                 _("Do you want to keep %s's files?"),
                                                 um_user_get_real_name (user));
 
                 gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
diff --git a/src/um-account-dialog.c b/src/um-account-dialog.c
index a8cdc51..53fcfb6 100644
--- a/src/um-account-dialog.c
+++ b/src/um-account-dialog.c
@@ -174,7 +174,7 @@ shortname_changed (GtkComboBox     *combo,
                 }
                 else {
                         tip = g_strdup (_("The short name must consist of:\n"
-                                          " \xe2\x9e\xa3 lower case letters from the English alphabet\n"
+                                          " \xe2\x9e\xa3 lowercase letters from the English alphabet\n"
                                           " \xe2\x9e\xa3 digits\n"
                                           " \xe2\x9e\xa3 any of the characters '.', '-' and '_'"));
                 }
diff --git a/src/um-fingerprint-dialog.c b/src/um-fingerprint-dialog.c
index 144b7b4..af90214 100644
--- a/src/um-fingerprint-dialog.c
+++ b/src/um-fingerprint-dialog.c
@@ -105,7 +105,7 @@ get_reason_for_error (const char *dbus_error)
         if (g_str_equal (dbus_error, "net.reactivated.Fprint.Error.AlreadyInUse"))
                 return N_("The device is already in use.");
         if (g_str_equal (dbus_error, "net.reactivated.Fprint.Error.Internal"))
-                return N_("An internal error occured");
+                return N_("An internal error occurred.");
 
         return NULL;
 }
diff --git a/src/um-password-dialog.c b/src/um-password-dialog.c
index 23defeb..97b699d 100644
--- a/src/um-password-dialog.c
+++ b/src/um-password-dialog.c
@@ -295,7 +295,7 @@ password_changed_cb (PasswdHandler    *handler,
         }
         else if (error->code == PASSWD_ERROR_AUTH_FAILED) {
                 primary_text = error->message;
-                secondary_text = _("Please type again your current password.");
+                secondary_text = _("Please type your current password again.");
 
                 gtk_entry_set_text (GTK_ENTRY (um->old_password_entry), "");
                 gtk_widget_grab_focus (um->old_password_entry);