[gnome-initial-setup] Fix grammar and style in translatable strings a bit

[Piotr DrÄg <piotrdrag src gnome org>]

commit 274d670c1d4829b3bba1aee99ff3e904d1465144
Author: Piotr DrÄg <piotrdrag gmail com>
Date:   Fri Jun 1 14:37:24 2012 +0200

    Fix grammar and style in translatable strings a bit

 gnome-initial-setup/setup.ui   |   20 ++++++++++----------
 gnome-initial-setup/um-utils.c |    8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gnome-initial-setup/setup.ui b/gnome-initial-setup/setup.ui
index 93f495e..1898606 100644
--- a/gnome-initial-setup/setup.ui
+++ b/gnome-initial-setup/setup.ui
@@ -57,7 +57,7 @@
         <child>
           <object class="GtkButton" id="local-account-cancel-button">
             <property name="visible">True</property>
-            <property name="label" translatable="True">_Cancel</property>
+            <property name="label" translatable="yes">_Cancel</property>
             <property name="use-underline">True</property>
           </object>
         </child>
@@ -65,7 +65,7 @@
           <object class="GtkButton" id="local-account-done-button">
             <property name="visible">True</property>
             <property name="sensitive">False</property>
-            <property name="label" translatable="True">_Done</property>
+            <property name="label" translatable="yes">_Done</property>
             <property name="use-underline">True</property>
           </object>
         </child>
@@ -101,7 +101,7 @@
             <child>
               <object class="GtkLabel" id="account-fullname-label">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">_Fullname</property>
+                <property name="label" translatable="yes">_Full Name</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">account-fullname-entry</property>
                 <property name="halign">end</property>
@@ -132,7 +132,7 @@
         <child>
           <object class="GtkLabel" id="account-username-label">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">_Username</property>
+            <property name="label" translatable="yes">_User Name</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">account-username-combo</property>
             <property name="halign">end</property>
@@ -457,7 +457,7 @@
         <child>
           <object class="GtkLabel" id="account-title">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Choose How to Login</property>
+            <property name="label" translatable="yes">Choose How to Log In</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="margin-bottom">18</property>
@@ -526,7 +526,7 @@
         <child>
           <object class="GtkLabel" id="location-title">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Choose your Location</property>
+            <property name="label" translatable="yes">Choose Your Location</property>
             <property name="halign">center</property>
             <property name="hexpand">False</property>
             <property name="valign">start</property>
@@ -610,7 +610,7 @@
             <child>
               <object class="GtkLabel" id="timezone-label">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Timezone</property>
+                <property name="label" translatable="yes">Time Zone</property>
                 <property name="halign">end</property>
                 <style>
                   <class name="dim-label"/>
@@ -731,7 +731,7 @@
         <child>
           <object class="GtkLabel" id="summary-title">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Enjoy GNOME !</property>
+            <property name="label" translatable="yes">Enjoy GNOME!</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="margin-bottom">18</property>
@@ -795,7 +795,7 @@
         <child>
           <object class="GtkLabel" id="summary-tour-details">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">New to GNOME 3 and need help finding your way around ?</property>
+            <property name="label" translatable="yes">New to GNOME 3 and need help finding your way around?</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
           </object>
@@ -810,7 +810,7 @@
           <object class="GtkButton" id="summary-tour-button">
             <property name="visible">True</property>
             <property name="use-underline">True</property>
-            <property name="label" translatable="yes">_Take a tour</property>
+            <property name="label" translatable="yes">_Take a Tour</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="margin">18</property>
diff --git a/gnome-initial-setup/um-utils.c b/gnome-initial-setup/um-utils.c
index f579cb7..e74df81 100644
--- a/gnome-initial-setup/um-utils.c
+++ b/gnome-initial-setup/um-utils.c
@@ -509,17 +509,17 @@ is_valid_username (const gchar *username, gchar **tip)
 
         if (!empty && (in_use || too_long || !valid)) {
                 if (in_use) {
-                        *tip = g_strdup_printf (_("A user with the username '%s' already exists"),
+                        *tip = g_strdup_printf (_("A user with the user name '%s' already exists"),
                                                username);
                 }
                 else if (too_long) {
-                        *tip = g_strdup_printf (_("The username is too long"));
+                        *tip = g_strdup_printf (_("The user name is too long"));
                 }
                 else if (username[0] == '-') {
-                        *tip = g_strdup (_("The username cannot start with a '-'"));
+                        *tip = g_strdup (_("The user name cannot start with a '-'"));
                 }
                 else {
-                        *tip = g_strdup (_("The username must consist of:\n"
+                        *tip = g_strdup (_("The user name must consist of:\n"
                                           " \xe2\x9e\xa3 letters from the English alphabet\n"
                                           " \xe2\x9e\xa3 digits\n"
                                           " \xe2\x9e\xa3 any of the characters '.', '-' and '_'"));