[gnome-control-center] user-accounts: update strings to new design

[Felipe Borges <felipeborges src gnome org>]

commit 6d24ed5ae90ab3563fccee7216519ace5eed2b5b
Author: Felipe Borges <felipeborges gnome org>
Date:   Tue May 24 10:50:30 2016 +0200

    user-accounts: update strings to new design
    
    https://wiki.gnome.org/Design/SystemSettings/UserAccounts
    
    https://bugzilla.gnome.org/show_bug.cgi?id=767065

 panels/user-accounts/data/account-dialog.ui  |    9 ++++-----
 panels/user-accounts/data/password-dialog.ui |    2 +-
 panels/user-accounts/pw-utils.c              |    2 +-
 panels/user-accounts/um-account-dialog.c     |    2 +-
 panels/user-accounts/um-utils.c              |    5 ++---
 5 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/panels/user-accounts/data/account-dialog.ui b/panels/user-accounts/data/account-dialog.ui
index 235188a..7cbb2b8 100644
--- a/panels/user-accounts/data/account-dialog.ui
+++ b/panels/user-accounts/data/account-dialog.ui
@@ -310,7 +310,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</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">local-verify</property>
                     <property name="margin_start">12</property>
@@ -383,7 +383,7 @@
                   <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
                     <property name="can_focus">False</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="wrap">True</property>
                     <property name="wrap_mode">word-char</property>
                     <property name="margin_bottom">12</property>
@@ -583,7 +583,7 @@
                   <object class="GtkLabel" id="label18">
                     <property name="visible">True</property>
                     <property name="can_focus">False</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="wrap">True</property>
                     <property name="wrap_mode">word-char</property>
                     <property name="margin_bottom">12</property>
@@ -621,8 +621,7 @@
                   <object class="GtkLabel" id="label17">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Go online to add
-enterprise login accounts.</property>
+                    <property name="label" translatable="yes">You must be online in order to add enterprise 
users.</property>
                     <property name="yalign">0</property>
                     <property name="justify">center</property>
                     <property name="vexpand">True</property>
diff --git a/panels/user-accounts/data/password-dialog.ui b/panels/user-accounts/data/password-dialog.ui
index 1160255..bf24769 100644
--- a/panels/user-accounts/data/password-dialog.ui
+++ b/panels/user-accounts/data/password-dialog.ui
@@ -237,7 +237,7 @@
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkRadioButton" id="action-login-radio">
-                        <property name="label" translatable="yes">Allow user to set a password when they 
next login</property>
+                        <property name="label" translatable="yes">Allow user to change their password on 
next login</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
diff --git a/panels/user-accounts/pw-utils.c b/panels/user-accounts/pw-utils.c
index b4926d0..8c70cd9 100644
--- a/panels/user-accounts/pw-utils.c
+++ b/panels/user-accounts/pw-utils.c
@@ -114,7 +114,7 @@ pw_error_hint (gint error)
         case PWQ_ERROR_MIN_LENGTH:
                 return C_("Password hint", "Try to add more letters, numbers and symbols.");
         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", "Good password! Adding more letters, numbers and punctuation will 
make it stronger.");
         }
diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
index ed23682..6bee2c1 100644
--- a/panels/user-accounts/um-account-dialog.c
+++ b/panels/user-accounts/um-account-dialog.c
@@ -31,7 +31,7 @@
 #include "pw-utils.h"
 
 #define PASSWORD_CHECK_TIMEOUT 600
-#define DOMAIN_DEFAULT_HINT _("Should match the web address of your account provider.")
+#define DOMAIN_DEFAULT_HINT _("Should match the web address of your login provider.")
 
 typedef enum {
         UM_LOCAL,
diff --git a/panels/user-accounts/um-utils.c b/panels/user-accounts/um-utils.c
index cd22fdf..dcb09f1 100644
--- a/panels/user-accounts/um-utils.c
+++ b/panels/user-accounts/um-utils.c
@@ -560,8 +560,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."));
@@ -570,7 +569,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 {