[gnome-initial-setup] account: Update strings to new design

[Ondrej Holy <oholy src gnome org>]

commit 3335232244217a378e13e802fcaba8448806fe95
Author: Ondrej Holy <oholy redhat com>
Date:   Wed May 31 10:25:06 2017 +0200

    account: Update strings to new design
    
    https://wiki.gnome.org/Design/SystemSettings/UserAccounts
    
    This was fixed in g-c-c by Bug 767065 already, let's sync this with
    g-i-s.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=709575

 .../pages/account/gis-account-page-enterprise.ui   |    2 +-
 gnome-initial-setup/pages/account/um-utils.c       |    5 ++---
 .../pages/password/gis-password-page.ui            |    2 +-
 gnome-initial-setup/pages/password/pw-utils.c      |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui 
b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui
index be3d033..c25c42a 100644
--- a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui
+++ b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui
@@ -42,7 +42,7 @@
             <property name="can_focus">False</property>
             <property name="valign">start</property>
             <property name="margin_bottom">26</property>
-            <property name="label" translatable="yes">Enterprise login allows an existing centrally managed 
user account to be used on this device.</property>
+            <property name="label" translatable="yes">Enterprise login allows an existing centrally managed 
user account to be used on this device. You can also use this account to access company resources on the 
internet.</property>
             <property name="justify">center</property>
             <property name="wrap">True</property>
             <property name="max-width-chars">45</property>
diff --git a/gnome-initial-setup/pages/account/um-utils.c b/gnome-initial-setup/pages/account/um-utils.c
index 85c0458..0ac8c95 100644
--- a/gnome-initial-setup/pages/account/um-utils.c
+++ b/gnome-initial-setup/pages/account/um-utils.c
@@ -242,8 +242,7 @@ 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."),
-                                               username);
+                        *tip = g_strdup (_("Sorry, that user name isn’t available. Please try another."));
                 }
                 else if (too_long) {
                         *tip = g_strdup_printf (_("The username is too long."));
@@ -252,7 +251,7 @@ is_valid_username (const gchar *username, gchar **tip)
                         *tip = g_strdup (_("The username cannot start with a ‘-’."));
                 }
                 else {
-                        *tip = g_strdup (_("The username should only consist of lower and upper case letters 
from a-z, digits and any of characters ‘.’, ‘-’ and ‘_’."));
+                        *tip = g_strdup (_("The username should only consist of upper and lower case letters 
from a-z, digits and the following characters: . - _"));
                 }
         }
         else {
diff --git a/gnome-initial-setup/pages/password/gis-password-page.ui 
b/gnome-initial-setup/pages/password/gis-password-page.ui
index e655124..0c94bcf 100644
--- a/gnome-initial-setup/pages/password/gis-password-page.ui
+++ b/gnome-initial-setup/pages/password/gis-password-page.ui
@@ -95,7 +95,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Verify</property>
+                <property name="label" translatable="yes">_Confirm</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">confirm_entry</property>
               </object>
diff --git a/gnome-initial-setup/pages/password/pw-utils.c b/gnome-initial-setup/pages/password/pw-utils.c
index 62656e9..bc3f254 100644
--- a/gnome-initial-setup/pages/password/pw-utils.c
+++ b/gnome-initial-setup/pages/password/pw-utils.c
@@ -114,7 +114,7 @@ pw_error_hint (gint error)
         case PWQ_ERROR_MIN_LENGTH:
                 return C_("Password hint", "Password needs to be longer. Try to add more letters, numbers 
and punctuation.");
         case PWQ_ERROR_EMPTY_PASSWORD:
-                return C_("Password hint", "Mix uppercase and lowercase and use a number or two.");
+                return C_("Password hint", "Mix uppercase and lowercase and try to use a number or two.");
         default:
                 return C_("Password hint", "Adding more letters, numbers and punctuation will make the 
password stronger.");
         }