applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user-accounts: update strings to new design

Browse source 
https://wiki.gnome.org/Design/SystemSettings/UserAccounts

https://bugzilla.gnome.org/show_bug.cgi?id=767065
This commit is contained in:
Felipe Borges 2016-05-24 10:50:30 +02:00
parent 7e4a51cb37
commit 6d24ed5ae9
5 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
panels/user-accounts/data/account-dialog.ui
View file

@ -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>

2
panels/user-accounts/data/password-dialog.ui
View file

@ -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>

2
panels/user-accounts/pw-utils.c
View file

@ -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.");
}

2
panels/user-accounts/um-account-dialog.c
View file

@ -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,

5
panels/user-accounts/um-utils.c
View file

@ -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 {