[gnome-system-tools] Update British English translation



commit 9302dcee2a7b5d8ea8acb81f87281cc8d6c883b4
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Aug 31 09:46:04 2010 +0100

    Update British English translation

 po/en_GB.po |  858 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 490 insertions(+), 368 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 9b53e1e..0eb3474 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,192 +8,181 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-system-tools\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-20 19:18+0000\n"
+"POT-Creation-Date: 2010-08-31 09:42+0100\n"
 "PO-Revision-Date: 2010-02-03 16:52+0100\n"
 "Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
 "Language-Team: British English <en li org>\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.5.1\n"
 
-#: ../gnome-system-tools.schemas.in.h:1
-msgid "Whether the users-admin tool should show system users in the users list"
-msgstr ""
-"Whether the users-admin tool should show system users in the users list"
-
-#: ../gnome-system-tools.schemas.in.h:2
-msgid ""
-"Whether the users-admin tool should show the root user in the users list"
-msgstr ""
-"Whether the users-admin tool should show the root user in the users list"
+#: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326
+msgid "Access point name:"
+msgstr "Access point name:"
 
-#: ../interfaces/network.ui.h:1
+#: ../interfaces/network.ui.h:2
 msgid "Account data"
 msgstr "Account data"
 
-#: ../interfaces/network.ui.h:2
-msgid "Connection Settings"
-msgstr "Connection Settings"
-
 #: ../interfaces/network.ui.h:3
-msgid "DNS Servers"
-msgstr "DNS Servers"
-
-#: ../interfaces/network.ui.h:4
-msgid "Host Settings"
-msgstr "Host Settings"
-
-#: ../interfaces/network.ui.h:5
-msgid "Internet service provider data"
-msgstr "Internet service provider data"
-
-#: ../interfaces/network.ui.h:6
-msgid "Modem Settings"
-msgstr "Modem Settings"
-
-#: ../interfaces/network.ui.h:7
-msgid "Search Domains"
-msgstr "Search Domains"
-
-#: ../interfaces/network.ui.h:8
-msgid "Wireless Settings"
-msgstr "Wireless Settings"
-
-#: ../interfaces/network.ui.h:9
-msgid "Access point name:"
-msgstr "Access point name:"
-
-#: ../interfaces/network.ui.h:10
 msgid "Aliases:"
 msgstr "Aliases:"
 
-#: ../interfaces/network.ui.h:11
+#: ../interfaces/network.ui.h:4
 msgid "Con_figuration:"
 msgstr "Con_figuration:"
 
-#: ../interfaces/network.ui.h:12
+#: ../interfaces/network.ui.h:5
+msgid "Connection Settings"
+msgstr "Connection Settings"
+
+#: ../interfaces/network.ui.h:6
 msgid "Connection type:"
 msgstr "Connection type:"
 
-#: ../interfaces/network.ui.h:13
+#: ../interfaces/network.ui.h:7
 msgid "Connections"
 msgstr "Connections"
 
-#: ../interfaces/network.ui.h:14
+#: ../interfaces/network.ui.h:8
 msgid "DNS"
 msgstr "DNS"
 
-#: ../interfaces/network.ui.h:15
+#: ../interfaces/network.ui.h:9
+msgid "DNS Servers"
+msgstr "DNS Servers"
+
+#: ../interfaces/network.ui.h:10
 msgid "D_omain name:"
 msgstr "D_omain name:"
 
-#: ../interfaces/network.ui.h:16
+#: ../interfaces/network.ui.h:11
 msgid "Delete current location"
 msgstr "Delete current location"
 
-#: ../interfaces/network.ui.h:17
+#: ../interfaces/network.ui.h:12
 msgid "E_nable roaming mode"
 msgstr "E_nable roaming mode"
 
-#: ../interfaces/network.ui.h:18
+#: ../interfaces/network.ui.h:13
 msgid "E_nable this connection"
 msgstr "E_nable this connection"
 
-#: ../interfaces/network.ui.h:19
+#: ../interfaces/network.ui.h:14 ../src/network/ifaces-list.c:335
 msgid "Ethernet interface:"
 msgstr "Ethernet interface:"
 
-#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:32
+#: ../interfaces/network.ui.h:15 ../interfaces/users.ui.h:27
 msgid "General"
 msgstr "General"
 
-#: ../interfaces/network.ui.h:21
+#: ../interfaces/network.ui.h:16
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: ../interfaces/network.ui.h:22
+#: ../interfaces/network.ui.h:17
 msgid "Host Alias Properties"
 msgstr "Host Alias Properties"
 
-#: ../interfaces/network.ui.h:23
+#: ../interfaces/network.ui.h:18
+msgid "Host Settings"
+msgstr "Host Settings"
+
+#: ../interfaces/network.ui.h:19
 msgid "Hosts"
 msgstr "Hosts"
 
-#: ../interfaces/network.ui.h:24 ../interfaces/shares.ui.h:14
+#: ../interfaces/network.ui.h:20 ../interfaces/shares.ui.h:11
 msgid "IP address:"
 msgstr "IP address:"
 
-#: ../interfaces/network.ui.h:25
+#: ../interfaces/network.ui.h:21
 msgid "Interface properties"
 msgstr "Interface properties"
 
-#: ../interfaces/network.ui.h:26
+#: ../interfaces/network.ui.h:22
+msgid "Internet service provider data"
+msgstr "Internet service provider data"
+
+#: ../interfaces/network.ui.h:23
 msgid "Location:"
 msgstr "Location:"
 
-#: ../interfaces/network.ui.h:27
+#: ../interfaces/network.ui.h:24
 msgid "Loud"
 msgstr "Loud"
 
-#: ../interfaces/network.ui.h:28
+#: ../interfaces/network.ui.h:25
 msgid "Low"
 msgstr "Low"
 
-#: ../interfaces/network.ui.h:29
+#: ../interfaces/network.ui.h:26
 msgid "Medium"
 msgstr "Medium"
 
-#: ../interfaces/network.ui.h:30
+#: ../interfaces/network.ui.h:27
 msgid "Modem"
 msgstr "Modem"
 
-#: ../interfaces/network.ui.h:31
+#: ../interfaces/network.ui.h:28
+msgid "Modem Settings"
+msgstr "Modem Settings"
+
+#: ../interfaces/network.ui.h:29
 msgid "Network _password:"
 msgstr "Network _password:"
 
-#: ../interfaces/network.ui.h:32
+#: ../interfaces/network.ui.h:30
 msgid "Network name (_ESSID):"
 msgstr "Network name (_ESSID):"
 
-#: ../interfaces/network.ui.h:33
+#: ../interfaces/network.ui.h:31
 msgid "Off"
 msgstr "Off"
 
-#: ../interfaces/network.ui.h:34
+#: ../interfaces/network.ui.h:32
 msgid "Options"
 msgstr "Options"
 
-#: ../interfaces/network.ui.h:35
+#: ../interfaces/network.ui.h:33
 msgid "P_assword"
 msgstr "P_assword"
 
-#: ../interfaces/network.ui.h:36
+#: ../interfaces/network.ui.h:34
 msgid "Password _type:"
 msgstr "Password _type:"
 
-#: ../interfaces/network.ui.h:37
+#: ../interfaces/network.ui.h:35
 msgid "Plain (ASCII)"
 msgstr "Plain (ASCII)"
 
-#: ../interfaces/network.ui.h:38
+#: ../interfaces/network.ui.h:36
 msgid "Pulses"
 msgstr "Pulses"
 
-#: ../interfaces/network.ui.h:39
+#: ../interfaces/network.ui.h:37
 msgid "Save current network configuration as a location"
 msgstr "Save current network configuration as a location"
 
-#: ../interfaces/network.ui.h:40
+#: ../interfaces/network.ui.h:38
+msgid "Search Domains"
+msgstr "Search Domains"
+
+#: ../interfaces/network.ui.h:39
 msgid "Tones"
 msgstr "Tones"
 
-#: ../interfaces/network.ui.h:41
+#: ../interfaces/network.ui.h:40
 msgid "Use the Internet service provider nameservers"
 msgstr "Use the Internet service provider nameservers"
 
+#: ../interfaces/network.ui.h:41
+msgid "Wireless Settings"
+msgstr "Wireless Settings"
+
 #: ../interfaces/network.ui.h:42
 msgid "_Autodetect"
 msgstr "_Autodetect"
@@ -246,7 +235,7 @@ msgstr "_Set modem as default route to the Internet"
 msgid "_Subnet mask:"
 msgstr "_Subnet mask:"
 
-#: ../interfaces/network.ui.h:55
+#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82
 msgid "_Username:"
 msgstr "_Username:"
 
@@ -264,98 +253,98 @@ msgid "Select the services that you wish to activate:"
 msgstr "Select the services that you wish to activate:"
 
 #: ../interfaces/shares.ui.h:1
-msgid "Allowed Hosts"
-msgstr "Allowed Hosts"
+msgid "Add allowed hosts"
+msgstr "Add allowed hosts"
 
 #: ../interfaces/shares.ui.h:2
-msgid "Hosts Settings"
-msgstr "Hosts Settings"
+msgid "Allowed Hosts"
+msgstr "Allowed Hosts"
 
 #: ../interfaces/shares.ui.h:3
-msgid "Share Properties"
-msgstr "Share Properties"
-
-#: ../interfaces/shares.ui.h:4
-msgid "Shared Folder"
-msgstr "Shared Folder"
-
-#: ../interfaces/shares.ui.h:5
-msgid "Windows sharing"
-msgstr "Windows sharing"
-
-#: ../interfaces/shares.ui.h:6
-msgid "Enter password for user:"
-msgstr "Enter password for user:"
-
-#: ../interfaces/shares.ui.h:7
-msgid "Add allowed hosts"
-msgstr "Add allowed hosts"
-
-#: ../interfaces/shares.ui.h:8
 msgid "Allowed hosts:"
 msgstr "Allowed hosts:"
 
-#: ../interfaces/shares.ui.h:9
+#: ../interfaces/shares.ui.h:4
 msgid "Comment:"
 msgstr "Comment:"
 
-#: ../interfaces/shares.ui.h:10
+#: ../interfaces/shares.ui.h:5
 msgid "Domain / _Workgroup:"
 msgstr "Domain/_Workgroup:"
 
-#: ../interfaces/shares.ui.h:11
+#: ../interfaces/shares.ui.h:6
 msgid "Enter password for user"
 msgstr "Enter password for user"
 
-#: ../interfaces/shares.ui.h:12
+#: ../interfaces/shares.ui.h:7
+msgid "Enter password for user:"
+msgstr "Enter password for user:"
+
+#: ../interfaces/shares.ui.h:8
 msgid "General Properties"
 msgstr "General Properties"
 
-#: ../interfaces/shares.ui.h:13
+#: ../interfaces/shares.ui.h:9
 msgid "Host name:"
 msgstr "Host name:"
 
-#: ../interfaces/shares.ui.h:15
+#: ../interfaces/shares.ui.h:10
+msgid "Hosts Settings"
+msgstr "Hosts Settings"
+
+#: ../interfaces/shares.ui.h:12
 msgid "Name:"
 msgstr "Name:"
 
-#: ../interfaces/shares.ui.h:16
+#: ../interfaces/shares.ui.h:13
 msgid "Netmask:"
 msgstr "Netmask:"
 
-#: ../interfaces/shares.ui.h:17
+#: ../interfaces/shares.ui.h:14
 msgid "Network:"
 msgstr "Network:"
 
-#: ../interfaces/shares.ui.h:18 ../src/shares/nfs-acl-table.c:56
+#: ../interfaces/shares.ui.h:15 ../src/shares/nfs-acl-table.c:56
 msgid "Read only"
 msgstr "Read only"
 
-#: ../interfaces/shares.ui.h:19
+#: ../interfaces/shares.ui.h:16
 msgid "Share"
 msgstr "Share"
 
-#: ../interfaces/shares.ui.h:20
+#: ../interfaces/shares.ui.h:17
+msgid "Share Properties"
+msgstr "Share Properties"
+
+#: ../interfaces/shares.ui.h:18
 msgid "Share through:"
 msgstr "Share through:"
 
-#: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2
+#: ../interfaces/shares.ui.h:19
+msgid "Shared Folder"
+msgstr "Shared Folder"
+
+#: ../interfaces/shares.ui.h:20 ../src/shares/shares.desktop.in.in.h:2
 #: ../src/shares/shares-tool.c:237
 msgid "Shared Folders"
 msgstr "Shared Folders"
 
-#: ../interfaces/shares.ui.h:22
+#: ../interfaces/shares.ui.h:21
 msgid "This computer is a _WINS server"
 msgstr "This computer is a _WINS server"
 
-#: ../interfaces/shares.ui.h:23
+#: ../interfaces/shares.ui.h:22
 msgid "Users"
 msgstr "Users"
 
-#: ../interfaces/shares.ui.h:24
+#: ../interfaces/shares.ui.h:23
 msgid "WINS _server:"
 msgstr "WINS _server:"
 
+#: ../interfaces/shares.ui.h:24
+msgid "Windows sharing"
+msgstr "Windows sharing"
+
 #: ../interfaces/shares.ui.h:25
 msgid "_Path:"
 msgstr "_Path:"
@@ -365,29 +354,29 @@ msgid "_Read only"
 msgstr "_Read only"
 
 #: ../interfaces/time.ui.h:1
-msgid "Selection"
-msgstr "Selection"
-
-#: ../interfaces/time.ui.h:2
-msgid "Time Zone"
-msgstr "Time Zone"
-
-#: ../interfaces/time.ui.h:3
 msgid "Add NTP Server"
 msgstr "Add NTP Server"
 
-#: ../interfaces/time.ui.h:4
+#: ../interfaces/time.ui.h:2
 msgid "NTP server"
 msgstr "NTP server"
 
-#: ../interfaces/time.ui.h:5
+#: ../interfaces/time.ui.h:3
 msgid "Se_lect Servers"
 msgstr "Se_lect Servers"
 
-#: ../interfaces/time.ui.h:6
+#: ../interfaces/time.ui.h:4
+msgid "Selection"
+msgstr "Selection"
+
+#: ../interfaces/time.ui.h:5
 msgid "Synchronize now"
 msgstr "Synchronise now"
 
+#: ../interfaces/time.ui.h:6
+msgid "Time Zone"
+msgstr "Time Zone"
+
 #: ../interfaces/time.ui.h:7
 msgid "Time servers"
 msgstr "Time servers"
@@ -421,120 +410,106 @@ msgid "_Time:"
 msgstr "_Time:"
 
 #: ../interfaces/users.ui.h:1
-msgid "Advanced Settings"
-msgstr "Advanced Settings"
+msgid ""
+"A user with this name already exists. Please choose a different name for the "
+"new user."
+msgstr ""
+"A user with this name already exists. Please choose a different name for the "
+"new user."
 
 #: ../interfaces/users.ui.h:2
-msgid "Automatic UID/GID"
-msgstr "Automatic UID/GID"
+msgid "Account _type:"
+msgstr "Account _type:"
 
 #: ../interfaces/users.ui.h:3
-msgid "Basic Settings"
-msgstr "Basic Settings"
+msgid "Advanced"
+msgstr "Advanced"
 
 #: ../interfaces/users.ui.h:4
-msgid "Group Members"
-msgstr "Group Members"
+msgid "Advanced Settings"
+msgstr "Advanced Settings"
 
 #: ../interfaces/users.ui.h:5
-msgid "Optional Settings"
-msgstr "Optional Settings"
+msgid "Assign a random password by default"
+msgstr "Assign a random password by default"
 
 #: ../interfaces/users.ui.h:6
-msgid "Password Settings"
-msgstr "Password Settings"
+msgid "Automatic UID/GID"
+msgstr "Automatic UID/GID"
 
+#: ../interfaces/users.ui.h:7
+msgid "Basic Settings"
+msgstr "Basic Settings"
 
 #: ../interfaces/users.ui.h:8
-msgid "System Defaults"
-msgstr "System Defaults"
-
-#: ../interfaces/users.ui.h:9
-msgid "Account _type:"
-msgstr "Account _type:"
-
-#: ../interfaces/users.ui.h:10
-msgid "Advanced"
-msgstr "Advanced"
-
-#: ../interfaces/users.ui.h:11
-msgid ""
-"A user with this name already exists. Please choose a different short "
-"name for the new user."
-msgstr ""
-"A user with this name already exists. Please choose a different short "
-"name for the new user."
-
-#: ../interfaces/users.ui.h:12
-msgid "Assign a random password by default"
-msgstr "Assign a random password by default"
-
-#: ../interfaces/users.ui.h:13
 msgid "Change Advanced User Settings"
 msgstr "Change Advanced User Settings"
 
-#: ../interfaces/users.ui.h:14
+#: ../interfaces/users.ui.h:9
 msgid "Change User Account Type"
 msgstr "Change User Account Type"
 
-#: ../interfaces/users.ui.h:15
-msgid "Change User Name and Login"
-msgstr "Change User Name and Login"
+#: ../interfaces/users.ui.h:10
+msgid "Change User Name"
+msgstr "Change User Name"
 
-#: ../interfaces/users.ui.h:16
+#: ../interfaces/users.ui.h:11
 msgid "Change User Password"
 msgstr "Change User Password"
 
-#: ../interfaces/users.ui.h:17
+#: ../interfaces/users.ui.h:12
 msgid "Changing advanced settings for:"
 msgstr "Changing advanced settings for:"
 
-#: ../interfaces/users.ui.h:18
+#: ../interfaces/users.ui.h:13
 msgid "Changing user account type for:"
 msgstr "Changing user account type for:"
 
-#: ../interfaces/users.ui.h:19
+#: ../interfaces/users.ui.h:14
 msgid "Changing user name for:"
 msgstr "Changing user name for:"
 
-#: ../interfaces/users.ui.h:20
+#: ../interfaces/users.ui.h:15
 msgid "Changing user password for:"
 msgstr "Changing user password for:"
 
-#: ../interfaces/users.ui.h:21
+#: ../interfaces/users.ui.h:16
 msgid "Con_firmation:"
 msgstr "Con_firmation:"
 
+#: ../interfaces/users.ui.h:17
+msgid "Contact Information"
+msgstr "Contact Information"
 
-#: ../interfaces/users.ui.h:23
+#: ../interfaces/users.ui.h:18
 msgid "Create New User"
 msgstr "Create New User"
 
-#: ../interfaces/users.ui.h:24
+#: ../interfaces/users.ui.h:19
 msgid "Create a new user"
 msgstr "Create a new user"
 
-#: ../interfaces/users.ui.h:25
+#: ../interfaces/users.ui.h:20
 msgid "Days between warning and password expiration:"
 msgstr "Days between warning and password expiration:"
 
-#: ../interfaces/users.ui.h:26
+#: ../interfaces/users.ui.h:21
 msgid "Default _group:"
 msgstr "Default _group:"
 
-#: ../interfaces/users.ui.h:27
+#: ../interfaces/users.ui.h:22
 msgid "Default _shell:"
 msgstr "Default _shell:"
 
-#: ../interfaces/users.ui.h:28
+#: ../interfaces/users.ui.h:23
 msgid "Disable _account"
 msgstr "Disable _account"
 
-#: ../interfaces/users.ui.h:29
+#: ../interfaces/users.ui.h:24
 msgid "Don't ask for password on _login"
 msgstr "Don't ask for password on _login"
 
-#: ../interfaces/users.ui.h:30
+#: ../interfaces/users.ui.h:25
 msgid ""
 "Encrypt all your files with your login password to strongly protect them "
 "from people with physical access to your computer, at the expense of a "
@@ -544,78 +519,98 @@ msgstr ""
 "from people with physical access to your computer, at the expense of a "
 "slightly reduced performance."
 
-#: ../interfaces/users.ui.h:31
+#: ../interfaces/users.ui.h:26
 msgid "Full _Name:"
 msgstr "Full _Name:"
 
-#: ../interfaces/users.ui.h:33
+#: ../interfaces/users.ui.h:28
 msgid "Generate _random password"
 msgstr "Generate _random password"
 
-#: ../interfaces/users.ui.h:34
+#: ../interfaces/users.ui.h:29
+msgid "Group Members"
+msgstr "Group Members"
+
+#: ../interfaces/users.ui.h:30
 msgid "Group _ID:"
 msgstr "Group _ID:"
 
-#: ../interfaces/users.ui.h:35
+#: ../interfaces/users.ui.h:31
 msgid "Group _name:"
 msgstr "Group _name:"
 
-#: ../interfaces/users.ui.h:36
+#: ../interfaces/users.ui.h:32
 msgid "Group properties"
 msgstr "Group properties"
 
-#: ../interfaces/users.ui.h:37
+#: ../interfaces/users.ui.h:33
+msgid "Groups available on the system:"
+msgstr "Groups available on the system:"
+
+#: ../interfaces/users.ui.h:34
 msgid "Groups settings"
 msgstr "Groups settings"
 
-#: ../interfaces/users.ui.h:38
+#: ../interfaces/users.ui.h:35
 msgid "Ma_ximum days a password may be used:"
 msgstr "Ma_ximum days a password may be used:"
 
-#: ../interfaces/users.ui.h:39
+#: ../interfaces/users.ui.h:36
 msgid "Maximum GID:"
 msgstr "Maximum GID:"
 
-#: ../interfaces/users.ui.h:40
+#: ../interfaces/users.ui.h:37
 msgid "Maximum UID:"
 msgstr "Maximum UID:"
 
-#: ../interfaces/users.ui.h:41
+#: ../interfaces/users.ui.h:38
 msgid "Mi_nimum days between password changes:"
 msgstr "Mi_nimum days between password changes:"
 
-#: ../interfaces/users.ui.h:42
+#: ../interfaces/users.ui.h:39
 msgid "Minimum GID:"
 msgstr "Minimum GID:"
 
-#: ../interfaces/users.ui.h:43
+#: ../interfaces/users.ui.h:40
 msgid "Minimum UID:"
 msgstr "Minimum UID:"
 
-#: ../interfaces/users.ui.h:44
+#: ../interfaces/users.ui.h:41
 msgid "Minimum days allowed between password changes:"
 msgstr "Minimum days allowed between password changes:"
 
-#: ../interfaces/users.ui.h:45
+#: ../interfaces/users.ui.h:42
 msgid "New _password:"
 msgstr "New _password:"
 
-#: ../interfaces/users.ui.h:46
+#: ../interfaces/users.ui.h:43
 msgid "Number of days that a password may be used:"
 msgstr "Number of days that a password may be used:"
 
-#: ../interfaces/users.ui.h:47
+#: ../interfaces/users.ui.h:44
 msgid "O_ffice location:"
 msgstr "O_ffice location:"
 
-#: ../interfaces/users.ui.h:48
+#: ../interfaces/users.ui.h:45
+msgid "Optional Settings"
+msgstr "Optional Settings"
+
+#: ../interfaces/users.ui.h:46
+msgid "Password Settings"
+msgstr "Password Settings"
+
+#: ../interfaces/users.ui.h:47
 msgid "Password set to: "
 msgstr "Password set to: "
 
-#: ../interfaces/users.ui.h:49
+#: ../interfaces/users.ui.h:48
 msgid "Privileges"
 msgstr "Privileges"
 
+#: ../interfaces/users.ui.h:49
+msgid "Profile Settings"
+msgstr "Profile Settings"
+
 #: ../interfaces/users.ui.h:50
 msgid "Profile _name:"
 msgstr "Profile _name:"
@@ -624,28 +619,15 @@ msgstr "Profile _name:"
 msgid "Set password b_y hand"
 msgstr "Set password b_y hand"
 
-#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read!
-#: ../interfaces/users.ui.h:53
-msgid ""
-"Short name must consist of:\n"
-"  â?£ lower case letters from the English alphabet\n"
-"  â?£ digits\n"
-"  â?£ any of the characters \".\", \"-\" and \"_\""
-msgstr ""
-"Short name must consist of:\n"
-"  â?£ lower case letters from the English alphabet\n"
-"  â?£ digits\n"
-"  â?£ any of the characters \".\", \"-\" and \"_\""
-
-#: ../interfaces/users.ui.h:57
-msgid "Short name must start with a letter!"
-msgstr "Short name must start with a letter!"
+#: ../interfaces/users.ui.h:52
+msgid "System Defaults"
+msgstr "System Defaults"
 
-#: ../interfaces/users.ui.h:58
+#: ../interfaces/users.ui.h:53
 msgid "This account is disabled."
 msgstr "This account is disabled."
 
-#: ../interfaces/users.ui.h:59
+#: ../interfaces/users.ui.h:54
 msgid ""
 "This account is using special settings that have been defined manually. Use "
 "the <i>Advanced Settings</i> dialog to tune them."
@@ -653,98 +635,131 @@ msgstr ""
 "This account is using special settings that have been defined manually. Use "
 "the <i>Advanced Settings</i> dialogue to tune them."
 
-#: ../interfaces/users.ui.h:60
+#: ../interfaces/users.ui.h:55
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../interfaces/users.ui.h:61
+#: ../interfaces/users.ui.h:56
 msgid "User Privileges"
 msgstr "User Privileges"
 
-#: ../interfaces/users.ui.h:62
+#: ../interfaces/users.ui.h:57
 msgid "User profiles"
 msgstr "User profiles"
 
+#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read!
+#: ../interfaces/users.ui.h:59
+msgid ""
+"Username must consist of:\n"
+"  â?£ lower case letters from the English alphabet\n"
+"  â?£ digits\n"
+"  â?£ any of the characters \".\", \"-\" and \"_\""
+msgstr ""
+"Username must consist of:\n"
+"  â?£ lower case letters from the English alphabet\n"
+"  â?£ digits\n"
+"  â?£ any of the characters \".\", \"-\" and \"_\""
+
 #: ../interfaces/users.ui.h:63
+msgid "Username must start with a letter!"
+msgstr "Username must start with a letter!"
+
+#: ../interfaces/users.ui.h:64
 msgid "You can't change user ID while the user is logged in."
 msgstr "You can't change user ID while the user is logged in."
 
-#: ../interfaces/users.ui.h:64
+#: ../interfaces/users.ui.h:65
 msgid "_Add Profile"
 msgstr "_Add Profile"
 
-#: ../interfaces/users.ui.h:65
+#: ../interfaces/users.ui.h:66
 msgid "_Advanced Settings"
 msgstr "_Advanced Settings"
 
-#: ../interfaces/users.ui.h:66
+#: ../interfaces/users.ui.h:67
 msgid "_Change..."
 msgstr "_Changeâ?¦"
 
-#: ../interfaces/users.ui.h:67
+#: ../interfaces/users.ui.h:68
 msgid "_Comments"
 msgstr "_Comments"
 
-#: ../interfaces/users.ui.h:68
+#: ../interfaces/users.ui.h:69
 msgid "_Current password:"
 msgstr "_Current password:"
 
-#: ../interfaces/users.ui.h:69
+#: ../interfaces/users.ui.h:70
 msgid "_Custom"
 msgstr "_Custom"
 
-#: ../interfaces/users.ui.h:70
+#: ../interfaces/users.ui.h:71
 msgid "_Days between warning and password expiration:"
 msgstr "_Days between warning and password expiration:"
 
-#: ../interfaces/users.ui.h:71
+#: ../interfaces/users.ui.h:72
 msgid "_Enable Account"
 msgstr "_Enable Account"
 
-#: ../interfaces/users.ui.h:72
+#: ../interfaces/users.ui.h:73
 msgid "_Encrypt home folder to protect sensitive data"
 msgstr "_Encrypt home folder to protect sensitive data"
 
-#: ../interfaces/users.ui.h:73
+#: ../interfaces/users.ui.h:74
 msgid "_Generate"
 msgstr "_Generate"
 
-#: ../interfaces/users.ui.h:74
+#: ../interfaces/users.ui.h:75
 msgid "_Home directory:"
 msgstr "_Home directory:"
 
-#: ../interfaces/users.ui.h:75
+#: ../interfaces/users.ui.h:76
 msgid "_Home phone:"
 msgstr "_Home phone:"
 
-#: ../interfaces/users.ui.h:76
+#: ../interfaces/users.ui.h:77
 msgid "_Main group:"
 msgstr "_Main group:"
 
-#: ../interfaces/users.ui.h:77
+#: ../interfaces/users.ui.h:78
 msgid "_Manage Groups"
 msgstr "_Manage Groups"
 
-#: ../interfaces/users.ui.h:78
+#: ../interfaces/users.ui.h:79
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../interfaces/users.ui.h:79
+#: ../interfaces/users.ui.h:80
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../interfaces/users.ui.h:80
+#: ../interfaces/users.ui.h:81
 msgid "_Shell:"
 msgstr "_Shell:"
 
-#: ../interfaces/users.ui.h:81
-msgid "_Short Name:"
-msgstr "_Short Name:"
-
-#: ../interfaces/users.ui.h:82
+#: ../interfaces/users.ui.h:83
 msgid "_Work phone:"
 msgstr "_Work phone:"
 
+#: ../org.gnome.system-tools.gschema.xml.in.h:1
+msgid "Show root user"
+msgstr "Show root user"
+
+#: ../org.gnome.system-tools.gschema.xml.in.h:2
+msgid "Show system users"
+msgstr "Show system users"
+
+#: ../org.gnome.system-tools.gschema.xml.in.h:3
+msgid ""
+"Whether the users-admin tool should show system users in the users list."
+msgstr ""
+"Whether the users-admin tool should show system users in the users list."
+
+#: ../org.gnome.system-tools.gschema.xml.in.h:4
+msgid ""
+"Whether the users-admin tool should show the root user in the users list."
+msgstr ""
+"Whether the users-admin tool should show the root user in the users list."
+
 #: ../src/common/gst-platform-dialog.c:179
 msgid "The platform you are running is not supported by this tool"
 msgstr "The platform you are running is not supported by this tool"
@@ -764,46 +779,46 @@ msgstr ""
 msgid "Unsupported platform"
 msgstr "Unsupported platform"
 
-#: ../src/common/gst-tool.c:190
+#: ../src/common/gst-tool.c:188
 msgid "The configuration could not be loaded"
 msgstr "The configuration could not be loaded"
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:192
+#: ../src/common/gst-tool.c:190
 msgid "The configuration could not be saved"
 msgstr "The configuration could not be saved"
 
-#: ../src/common/gst-tool.c:196
+#: ../src/common/gst-tool.c:194
 msgid "You are not allowed to access the system configuration."
 msgstr "You are not allowed to access the system configuration."
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:690
+#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685
 msgid "You are not allowed to modify the system configuration."
 msgstr "You are not allowed to modify the system configuration."
 
-#: ../src/common/gst-tool.c:201
+#: ../src/common/gst-tool.c:199
 msgid "Invalid data was found."
 msgstr "Invalid data was found."
 
 #. OOBS_RESULT_ERROR
-#: ../src/common/gst-tool.c:203
+#: ../src/common/gst-tool.c:201
 msgid "An unknown error occurred."
 msgstr "An unknown error occurred."
 
-#: ../src/common/gst-tool.c:427
+#: ../src/common/gst-tool.c:422
 msgid "Could not display help"
 msgstr "Could not display help"
 
-#: ../src/common/gst-tool.c:621
+#: ../src/common/gst-tool.c:616
 msgid "The system configuration has potentially changed."
 msgstr "The system configuration has potentially changed."
 
-#: ../src/common/gst-tool.c:623
+#: ../src/common/gst-tool.c:618
 msgid "Update content? This will lose any modification in course."
 msgstr "Update content? This will lose any modification in course."
 
-#: ../src/common/gst-tool.c:692
+#: ../src/common/gst-tool.c:687
 #, c-format
 msgid ""
 "An error occurred while checking for authorizations: %s\n"
@@ -822,7 +837,7 @@ msgstr "_Add"
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../src/network/address-list.c:486
+#: ../src/network/address-list.c:485
 msgid "Type address"
 msgstr "Type address"
 
@@ -930,61 +945,48 @@ msgstr "Roaming mode enabled"
 
 #: ../src/network/ifaces-list.c:289
 #, c-format
-msgid "Essid: %s "
-msgstr "Essid: %s "
+msgid "<b>Essid:</b> %s "
+msgstr "<b>Essid</b>: %s "
 
-#: ../src/network/ifaces-list.c:295
-#, c-format
-msgid "Address: %s Subnet mask: %s"
-msgstr "Address: %s Subnet mask: %s"
+#: ../src/network/ifaces-list.c:296 ../src/network/ifaces-list.c:301
+#: ../src/network/ifaces-list.c:306
+msgid "Address:"
+msgstr "Address:"
 
-#: ../src/network/ifaces-list.c:299
-#, c-format
-msgid "Address: %s"
-msgstr "Address: %s"
+#: ../src/network/ifaces-list.c:298
+msgid "Subnet mask:"
+msgstr "Subnet mask:"
 
-#: ../src/network/ifaces-list.c:303
-#, c-format
-msgid "Address: %s Remote address: %s"
-msgstr "Address: %s Remote address: %s"
+#: ../src/network/ifaces-list.c:308
+msgid "Remote address:"
+msgstr "Remote address:"
 
-#: ../src/network/ifaces-list.c:315
-#, c-format
-msgid "Type: %s Phone number: %s"
-msgstr "Type: %s Phone number: %s"
+#: ../src/network/ifaces-list.c:320 ../src/network/ifaces-list.c:325
+#: ../src/network/ifaces-list.c:334 ../src/network/ifaces-list.c:339
+msgid "Type:"
+msgstr "Type:"
 
-#: ../src/network/ifaces-list.c:318
-#, c-format
-msgid "Type: %s Access point name: %s"
-msgstr "Type: %s Access point name: %s"
-
-#: ../src/network/ifaces-list.c:325
-#, c-format
-msgid "Type: %s Ethernet interface: %s"
-msgstr "Type: %s Ethernet interface: %s"
+#: ../src/network/ifaces-list.c:321
+msgid "Phone number:"
+msgstr "Phone number:"
 
-#: ../src/network/ifaces-list.c:329
-#, c-format
-msgid "Type: %s"
-msgstr "Type: %s"
-
-#: ../src/network/ifaces-list.c:346
+#: ../src/network/ifaces-list.c:356
 msgid "Wireless connection"
 msgstr "Wireless connection"
 
-#: ../src/network/ifaces-list.c:348
+#: ../src/network/ifaces-list.c:358
 msgid "Infrared connection"
 msgstr "Infrared connection"
 
-#: ../src/network/ifaces-list.c:350
+#: ../src/network/ifaces-list.c:360
 msgid "Wired connection"
 msgstr "Wired connection"
 
-#: ../src/network/ifaces-list.c:352
+#: ../src/network/ifaces-list.c:362
 msgid "Parallel port connection"
 msgstr "Parallel port connection"
 
-#: ../src/network/ifaces-list.c:354
+#: ../src/network/ifaces-list.c:364
 msgid "Point to point connection"
 msgstr "Point-to-point connection"
 
@@ -1058,12 +1060,12 @@ msgstr "Network Settings"
 msgid "Settings for service \"%s\""
 msgstr "Settings for service \"%s\""
 
-#: ../src/services/callbacks.c:125
+#: ../src/services/callbacks.c:122
 #, c-format
 msgid "Are you sure you want to deactivate %s?"
 msgstr "Are you sure you want to deactivate %s?"
 
-#: ../src/services/callbacks.c:129
+#: ../src/services/callbacks.c:126
 msgid ""
 "This may affect your system behavior in several ways, possibly leading to "
 "data loss."
@@ -1535,11 +1537,11 @@ msgstr "Add a shared path, modifies it if it already exists"
 msgid "PATH"
 msgstr "PATH"
 
-#: ../src/shares/nautilus/nautilus-shares.c:152
+#: ../src/shares/nautilus/nautilus-shares.c:151
 msgid "_Share Folder..."
 msgstr "_Share Folderâ?¦"
 
-#: ../src/shares/nautilus/nautilus-shares.c:153
+#: ../src/shares/nautilus/nautilus-shares.c:152
 msgid "Share this folder with other computers"
 msgstr "Share this folder with other computers"
 
@@ -1600,6 +1602,18 @@ msgstr ""
 "You need to install at least either Samba or NFS in order to share your "
 "folders."
 
+#: ../src/time/e-map/e-map.c:620
+msgid "World Map"
+msgstr "World Map"
+
+#: ../src/time/e-map/e-map.c:622
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"Mouse-based interactive map widget for selecting the timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+
 #: ../src/time/time.desktop.in.in.h:1
 msgid "Change system time, date, and timezone"
 msgstr "Change system time, date, and timezone"
@@ -1608,11 +1622,11 @@ msgstr "Change system time, date, and timezone"
 msgid "Time and Date"
 msgstr "Time and Date"
 
-#: ../src/time/time-tool.c:402
+#: ../src/time/time-tool.c:398
 msgid "NTP support is not installed"
 msgstr "NTP support is not installed"
 
-#: ../src/time/time-tool.c:404
+#: ../src/time/time-tool.c:400
 msgid ""
 "Please install and activate NTP support in the system to enable "
 "synchronization of your local time server with internet time servers."
@@ -1620,27 +1634,27 @@ msgstr ""
 "Please install and activate NTP support in the system to enable "
 "synchronisation of your local time server with Internet time servers."
 
-#: ../src/time/time-tool.c:433
+#: ../src/time/time-tool.c:429
 msgid "Enabling NTP"
 msgstr "Enabling NTP"
 
-#: ../src/time/time-tool.c:433
+#: ../src/time/time-tool.c:429
 msgid "Disabling NTP"
 msgstr "Disabling NTP"
 
-#: ../src/time/time-tool.c:445
+#: ../src/time/time-tool.c:441
 msgid "Synchronizing system clock"
 msgstr "Synchronising system clock"
 
-#: ../src/time/time-tool.c:525
+#: ../src/time/time-tool.c:521
 msgid "Keep synchronized with Internet servers"
 msgstr "Keep synchronised with Internet servers"
 
-#: ../src/time/time-tool.c:526
+#: ../src/time/time-tool.c:522
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/time/time-tool.c:672
+#: ../src/time/time-tool.c:665
 msgid "Time and Date Settings"
 msgstr "Time and Date Settings"
 
@@ -1650,7 +1664,7 @@ msgstr "Administrator group can not be deleted"
 
 #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221
 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88
-#: ../src/users/user-settings.c:476
+#: ../src/users/user-settings.c:605
 msgid "This would leave the system unusable."
 msgstr "This would leave the system unusable."
 
@@ -1728,6 +1742,15 @@ msgstr "Please choose a different numeric identifier for group \"%s\"."
 msgid "Group name"
 msgstr "Group name"
 
+#. TRANSLATORS:  This applies to a password. Keep the string short.
+#: ../src/users/main.c:74 ../src/users/user-settings.c:347
+msgid "Not asked on login"
+msgstr "Not asked on login"
+
+#: ../src/users/main.c:74 ../src/users/user-settings.c:349
+msgid "Asked on login"
+msgstr "Asked on login"
+
 #: ../src/users/privileges-table.c:53
 msgid "Monitor system logs"
 msgstr "Monitor system logs"
@@ -1840,37 +1863,42 @@ msgstr "Desktop user"
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../src/users/run-passwd.c:494
+#: ../src/users/run-passwd.c:498
 #, c-format
 msgid "The new password is too short"
 msgstr "The new password is too short"
 
-#: ../src/users/run-passwd.c:499
+#: ../src/users/run-passwd.c:504
 #, c-format
 msgid "The new password is too simple"
 msgstr "The new password is too simple"
 
-#: ../src/users/run-passwd.c:503
+#: ../src/users/run-passwd.c:510
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "The old and new passwords are too similar"
 
-#: ../src/users/run-passwd.c:506
+#: ../src/users/run-passwd.c:513
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "The new password must contain numeric or special characters"
 
-#: ../src/users/run-passwd.c:510
+#: ../src/users/run-passwd.c:517
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "The old and new passwords are the same"
 
-#: ../src/users/run-passwd.c:514
+#: ../src/users/run-passwd.c:520
+#, c-format
+msgid "The new password has already been used recently."
+msgstr "The new password has already been used recently."
+
+#: ../src/users/run-passwd.c:524
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "Your password has been changed since you initially authenticated!"
 
-#: ../src/users/run-passwd.c:518
+#: ../src/users/run-passwd.c:528
 #, c-format
 msgid "Unknown error"
 msgstr "Unknown error"
@@ -1889,10 +1917,10 @@ msgstr "Password is too short"
 
 #: ../src/users/user-password.c:98
 msgid ""
-"User passwords must be longer than 6 characters and preferably formed by "
+"User passwords must be longer than 5 characters and preferably formed by "
 "numbers, letters and special characters."
 msgstr ""
-"User passwords must be longer than 6 characters and preferably formed by "
+"User passwords must be longer than 5 characters and preferably formed by "
 "numbers, letters and special characters."
 
 #: ../src/users/user-password.c:101
@@ -1982,15 +2010,6 @@ msgstr "Custom"
 msgid "None"
 msgstr "None"
 
-#. TRANSLATORS:  This applies to a password. Keep the string short.
-#: ../src/users/user-settings.c:347
-msgid "Not asked on login"
-msgstr "Not asked on login"
-
-#: ../src/users/user-settings.c:349
-msgid "Asked on login"
-msgstr "Asked on login"
-
 #: ../src/users/user-settings.c:393
 #, c-format
 msgid "Invalid character \"%c\" in comment"
@@ -2000,67 +2019,147 @@ msgstr "Invalid character \"%c\" in comment"
 msgid "Check that this character is not used."
 msgstr "Check that this character is not used."
 
-#: ../src/users/user-settings.c:417
+#: ../src/users/user-settings.c:426
 msgid "Incomplete path in home directory"
 msgstr "Incomplete path in home directory"
 
-#: ../src/users/user-settings.c:418
+#: ../src/users/user-settings.c:427
 msgid ""
 "Please enter full path for home directory\n"
-"i.e.: /home/john."
+"<span size=\"smaller\">i.e.: /home/john</span>."
 msgstr ""
 "Please enter full path for home directory\n"
-"i.e.: /home/john."
+"<span size=\"smaller\">i.e.: /home/john</span>."
 
-#: ../src/users/user-settings.c:433
-msgid "Home directory already exists"
-msgstr "Home directory already exists"
+#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491
+msgid "New home directory already exists, use it?"
+msgstr "New home directory already exists. Use it?"
 
-#: ../src/users/user-settings.c:434
+#: ../src/users/user-settings.c:449
 #, c-format
 msgid ""
-"The directory <tt>%s</tt> already exists. User may not have the permissions "
-"required to read or write in that directory. Do you want to use it anyway?"
+"The home directory for %s has been set to <tt>%s</tt>, which already exists. "
+"Do you want to use files from this directory, or copy the contents of <tt>"
+"%s</tt> to the new home, overwriting it?\n"
+"\n"
+"In doubt, use the new directory to avoid losing data, and copy files from "
+"the old directory later."
 msgstr ""
-"The directory <tt>%s</tt> already exists. User may not have the permissions "
-"required to read or write in that directory. Do you want to use it anyway?"
+"The home directory for %s has been set to <tt>%s</tt>, which already exists. "
+"Do you want to use files from this directory, or copy the contents of <tt>"
+"%s</tt> to the new home, overwriting it?\n"
+"\n"
+"In doubt, use the new directory to avoid losing data, and copy files from "
+"the old directory later."
+
+#: ../src/users/user-settings.c:461
+msgid "_Replace With Old Files"
+msgstr "_Replace with Old Files"
+
+#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504
+#: ../src/users/user-settings.c:540
+msgid "_Cancel Change"
+msgstr "_Cancel Change"
+
+#. TRANSLATORS: This means "use the files from the new location",
+#. * as opposed to those from the old location.
+#: ../src/users/user-settings.c:465
+msgid "_Use New Files"
+msgstr "_Use New Files"
+
+#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510
+msgid "Make user the _owner of the new home directory"
+msgstr "Make user the _owner of the new home directory"
+
+#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547
+msgid "_Delete old home directory"
+msgstr "_Delete old home directory"
+
+#: ../src/users/user-settings.c:493
+#, c-format
+msgid ""
+"The home directory for %s has been set to <tt>%s</tt>, which already exists. "
+"Do you want to use files from this directory, or delete all its contents and "
+"use a completely empty home directory?\n"
+"\n"
+"In doubt, keep the files, and remove them later if needed."
+msgstr ""
+"The home directory for %s has been set to <tt>%s</tt>, which already exists. "
+"Do you want to use files from this directory, or delete all its contents and "
+"use a completely empty home directory?\n"
+"\n"
+"In doubt, keep the files, and remove them later if needed."
+
+#: ../src/users/user-settings.c:503
+msgid "_Delete Files"
+msgstr "_Delete Files"
+
+#: ../src/users/user-settings.c:505
+msgid "_Use Existing Files"
+msgstr "_Use Existing Files"
 
-#: ../src/users/user-settings.c:440
-msgid "Use this directory"
-msgstr "Use this directory"
+#: ../src/users/user-settings.c:526
+msgid "Copy old home directory to new location?"
+msgstr "Copy old home directory to new location?"
 
-#: ../src/users/user-settings.c:475
+#: ../src/users/user-settings.c:528
+#, c-format
+msgid ""
+"The home directory for %s has been set to <tt>%s</tt>, which doesn't exist. "
+"Do you want to copy the contents of the old home directory (<tt>%s</tt>), or "
+"use a completely empty home directory?\n"
+"\n"
+"If you choose to copy the files to the new location, it's safe to delete the "
+"old directory."
+msgstr ""
+"The home directory for %s has been set to <tt>%s</tt>, which doesn't exist. "
+"Do you want to copy the contents of the old home directory (<tt>%s</tt>), or "
+"use a completely empty home directory?\n"
+"\n"
+"If you choose to copy the files to the new location, it's safe to delete the "
+"old directory."
+
+#: ../src/users/user-settings.c:539
+msgid "_Use Empty Directory"
+msgstr "_Use Empty Directory"
+
+#. TRANSLATORS: This means "copy files from the old home directory".
+#: ../src/users/user-settings.c:542
+msgid "Co_py Old Files"
+msgstr "Co_py Old Files"
+
+#: ../src/users/user-settings.c:604
 msgid "ID for the root user should not be modified"
 msgstr "ID for the root user should not be modified"
 
 #. check that UID is free
-#: ../src/users/user-settings.c:479
+#: ../src/users/user-settings.c:608
 #, c-format
 msgid "User ID %d is already used by user %s"
 msgstr "User ID %d is already used by user %s"
 
-#: ../src/users/user-settings.c:481
+#: ../src/users/user-settings.c:610
 #, c-format
 msgid "Please choose a different numeric identifier for %s."
 msgstr "Please choose a different numeric identifier for %s."
 
-#: ../src/users/user-settings.c:499
+#: ../src/users/user-settings.c:628
 msgid "Incomplete path in shell"
 msgstr "Incomplete path in shell"
 
-#: ../src/users/user-settings.c:500
+#: ../src/users/user-settings.c:629
 msgid ""
 "Please enter full path for shell\n"
-"i.e.: /bin/bash."
+"<span size=\"smaller\">i.e.: /bin/bash</span>."
 msgstr ""
 "Please enter full path for shell\n"
-"i.e.: /bin/bash."
+"<span size=\"smaller\">i.e.: /bin/bash</span>."
 
-#: ../src/users/user-settings.c:534
+#: ../src/users/user-settings.c:663
 msgid "Can't revoke administration rights"
 msgstr "Can't revoke administration rights"
 
-#: ../src/users/user-settings.c:537
+#: ../src/users/user-settings.c:666
 #, c-format
 msgid ""
 "%s is the only administrator on this computer. Revoking administration "
@@ -2069,11 +2168,11 @@ msgstr ""
 "%s is the only administrator on this computer. Revoking administration "
 "rights for this account would lock you out of administrating the system."
 
-#: ../src/users/user-settings.c:554
+#: ../src/users/user-settings.c:683
 msgid "You are about to revoke your own administration rights"
 msgstr "You are about to revoke your own administration rights"
 
-#: ../src/users/user-settings.c:557
+#: ../src/users/user-settings.c:686
 #, c-format
 msgid ""
 "%s will no longer be able to perform administrative tasks. This account "
@@ -2082,14 +2181,48 @@ msgstr ""
 "%s will no longer be able to perform administrative tasks. This account "
 "won't be allowed to get administration rights back on its own."
 
-#: ../src/users/user-settings.c:562
+#: ../src/users/user-settings.c:691
 msgid "Give up administration rights"
 msgstr "Give up administration rights"
 
-#: ../src/users/users-tool.c:284
+#: ../src/users/user-settings.c:1459
+msgid "Applying changes to user settings..."
+msgstr "Applying changes to user settingsâ?¦"
+
+#: ../src/users/users-tool.c:288
 msgid "Users Settings"
 msgstr "Users Settings"
 
+#~ msgid "_Short Name:"
+#~ msgstr "_Short Name:"
+
+#~ msgid "Address: %s Subnet mask: %s"
+#~ msgstr "Address: %s Subnet mask: %s"
+
+#~ msgid "Address: %s Remote address: %s"
+#~ msgstr "Address: %s Remote address: %s"
+
+#~ msgid "Type: %s Phone number: %s"
+#~ msgstr "Type: %s Phone number: %s"
+
+#~ msgid "Type: %s Access point name: %s"
+#~ msgstr "Type: %s Access point name: %s"
+
+#~ msgid "Type: %s Ethernet interface: %s"
+#~ msgstr "Type: %s Ethernet interface: %s"
+
+#~ msgid "Type: %s"
+#~ msgstr "Type: %s"
+
+#~ msgid ""
+#~ "The directory <tt>%s</tt> already exists. User may not have the "
+#~ "permissions required to read or write in that directory. Do you want to "
+#~ "use it anyway?"
+#~ msgstr ""
+#~ "The directory <tt>%s</tt> already exists. User may not have the "
+#~ "permissions required to read or write in that directory. Do you want to "
+#~ "use it anyway?"
+
 #~ msgid ""
 #~ "Allow this user to open a local session without entering his password. "
 #~ "The password will still be required to perform administrative tasks."
@@ -2273,13 +2406,11 @@ msgstr "Users Settings"
 #~ msgstr "Security"
 
 #~ msgid ""
-#~ "Several bootloaders have been "
-#~ "found\n"
+#~ "Several bootloaders have been found\n"
 #~ "\n"
 #~ "please select which do you want to configure"
 #~ msgstr ""
-#~ "Several bootloaders have been "
-#~ "found\n"
+#~ "Several bootloaders have been found\n"
 #~ "\n"
 #~ "please select which do you want to configure"
 
@@ -2431,9 +2562,6 @@ msgstr "Users Settings"
 #~ msgid "_Hostname:"
 #~ msgstr "_Hostname:"
 
-#~ msgid "Service Settings"
-#~ msgstr "Service Settings"
-
 #~ msgid "Description:"
 #~ msgstr "Description:"
 
@@ -2590,9 +2718,6 @@ msgstr "Users Settings"
 #~ msgid "Default"
 #~ msgstr "Default"
 
-#~ msgid "Type"
-#~ msgstr "Type"
-
 #~ msgid "Kernel Image"
 #~ msgstr "Kernel Image"
 
@@ -2651,15 +2776,15 @@ msgstr "Users Settings"
 #~ msgid ""
 #~ "This is still a work in progress, and so it may have serious bugs. Due to "
 #~ "the nature of these tools, bugs may render your computer <span weight="
-#~ "\"bold\">practically useless, costing time, effort and sanity "
-#~ "points. You have been warned. Thank you for trying out this prerelease of "
-#~ "the GNOME System Tools!"
+#~ "\"bold\">practically useless, costing time, effort and sanity points. You "
+#~ "have been warned. Thank you for trying out this prerelease of the GNOME "
+#~ "System Tools!"
 #~ msgstr ""
 #~ "This is still a work in progress, and so it may have serious bugs. Due to "
 #~ "the nature of these tools, bugs may render your computer <span weight="
-#~ "\"bold\">practically useless, costing time, effort and sanity "
-#~ "points. You have been warned. Thank you for trying out this prerelease of "
-#~ "the GNOME System Tools!"
+#~ "\"bold\">practically useless, costing time, effort and sanity points. You "
+#~ "have been warned. Thank you for trying out this prerelease of the GNOME "
+#~ "System Tools!"
 
 #~ msgid "Warning"
 #~ msgstr "Warning"
@@ -2827,9 +2952,6 @@ msgstr "Users Settings"
 #~ msgid "Home directory should not be empty"
 #~ msgstr "Home directory should not be empty"
 
-#~ msgid "Make sure you provide a home directory"
-#~ msgstr "Make sure you provide a home directory"
-
 #~ msgid "Home directory of the \"root\" user should not be modified"
 #~ msgstr "Home directory of the \"root\" user should not be modified"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]