[gnome-initial-setup] update zh_CN translation

[YunQiang Su <yqsu src gnome org>]

commit 098bd417aa67b1e593d95f2292080edcc86935c7
Author: widget <operawidget gmail com>
Date:   Tue Jul 29 15:15:28 2014 +0800

    update zh_CN translation

 po/zh_CN.po |  315 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 192 insertions(+), 123 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 54ffbea..1088aad 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,16 +11,16 @@ msgstr ""
 "Project-Id-Version: gnome-initial-setup master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "initial-setup&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-08 07:50+0000\n"
-"PO-Revision-Date: 2014-03-08 23:25+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
+"POT-Creation-Date: 2014-07-24 21:21+0000\n"
+"PO-Revision-Date: 2014-06-01 11:03+0800\n"
+"Last-Translator: irisgyq <gouyingqiyanxuan321 gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../data/gnome-initial-setup.desktop.in.in.h:1
 msgid "Initial Setup"
@@ -56,114 +56,88 @@ msgstr "- GNOME 初始配置"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page.c:202
 #: ../gnome-initial-setup/pages/account/gis-account-page-local.ui.h:2
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.ui.h:1
 msgid "About You"
 msgstr "关于您"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.c:179
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.c:180
 msgid "Failed to register account"
 msgstr "注册帐号失败"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.c:373
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.c:374
 msgid "No supported way to authenticate with this domain"
 msgstr "无法支持在该域进行认证"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.c:413
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.c:414
 msgid "Failed to join domain"
 msgstr "加入域失败"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.c:481
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.c:482
 msgid "Failed to log into domain"
 msgstr "登录到域失败"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:1
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:1
 msgid "Enterprise Login"
 msgstr "企业登录"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:2
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:2
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device."
 msgstr "企业登录允许在本机上使用已有的、集中式管理的用户帐号。"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:3
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:3
 msgid "_Domain"
 msgstr "域(_D)"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:4
 #: ../gnome-initial-setup/pages/account/gis-account-page-local.ui.h:5
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:4
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.ui.h:4
 msgid "_Username"
 msgstr "用户名(_U)"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:5
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:5
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.ui.h:6
+#: ../gnome-initial-setup/pages/password/gis-password-page.ui.h:3
 msgid "_Password"
 msgstr "密码(_P)"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:6
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:6
 msgid "Enterprise domain or realm name"
 msgstr "企业域或领域名称"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:7
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:7
 msgid "C_ontinue"
 msgstr "继续(_O)"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:8
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:8
 msgid "Domain Administrator Login"
 msgstr "域管理员登陆"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:9
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:9
-#| msgid ""
-#| "In order to use enterprise logins, this computer needs to be\n"
-#| "                enrolled in the domain. Please have your network "
-#| "administrator\n"
-#| "                type their domain password here, and choose a unique "
-#| "computer\n"
-#| "                name for your computer."
 msgid ""
-"In order to use enterprise logins, this computer needs to be enrolled in the "
-"domain. Please have your network administrator type their domain password "
+"In order to use enterprise logins, this computer needs to be enrolled in a "
+"domain. Please have your network administrator type the domain password "
 "here, and choose a unique computer name for your computer."
 msgstr ""
-"要想使用企业登录，该计算机需要在该域内登记。请让网络管理员"
-"在此输入域密码，并为您的计算机设置一个唯一的计算机名。"
+"要想使用企业登录，该计算机需要在该域内登记。请让网络管理员在此输入域密码，并"
+"为您的计算机设置一个唯一的计算机名。"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:10
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:10
 msgid "_Computer"
 msgstr "计算机(_C)"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:11
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:11
 msgid "Administrator _Name"
 msgstr "管理员姓名(_N)"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-enterprise.ui.h:12
-#: ../gnome-initial-setup/pages/password/gis-account-page-enterprise.ui.h:12
 msgid "Administrator Password"
 msgstr "管理员密码"
 
-#: ../gnome-initial-setup/pages/account/gis-account-page-local.c:198
+#: ../gnome-initial-setup/pages/account/gis-account-page-local.c:202
 msgid "Are these the right details? You can change them if you want."
 msgstr "这些详细信息正确吗？如果需要您可以修改。"
 
-#: ../gnome-initial-setup/pages/account/gis-account-page-local.c:347
+#: ../gnome-initial-setup/pages/account/gis-account-page-local.c:394
 #: ../gnome-initial-setup/pages/account/gis-account-page-local.ui.h:3
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.ui.h:2
 msgid "We need a few details to complete setup."
 msgstr "我们需要一些详细信息来完成设置。"
 
@@ -172,14 +146,12 @@ msgid "Avatar image"
 msgstr "头像图片"
 
 #: ../gnome-initial-setup/pages/account/gis-account-page-local.ui.h:4
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.ui.h:3
 msgid "_Full Name"
 msgstr "全名(_F)"
 
-#: ../gnome-initial-setup/pages/account/gis-account-page-local.ui.h:6
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.ui.h:5
-msgid "Your username cannot be changed after setup."
-msgstr "您的用户名在设置完后将不能修改。"
+#: ../gnome-initial-setup/pages/account/gis-account-page.ui.h:1
+msgid "Set Up _Enterprise Login"
+msgstr "设置企业登录(_E)"
 
 #: ../gnome-initial-setup/pages/account/um-photo-dialog.c:246
 msgid "Disable image"
@@ -190,64 +162,52 @@ msgid "Take a photo..."
 msgstr "拍照..."
 
 #: ../gnome-initial-setup/pages/account/um-realm-manager.c:310
-#: ../gnome-initial-setup/pages/password/um-realm-manager.c:351
 msgid "Cannot automatically join this type of domain"
 msgstr "无法自动加入该类型的域"
 
 #: ../gnome-initial-setup/pages/account/um-realm-manager.c:373
-#: ../gnome-initial-setup/pages/password/um-realm-manager.c:414
 #, c-format
 msgid "No such domain or realm found"
 msgstr "未找到此域或领域"
 
 #: ../gnome-initial-setup/pages/account/um-realm-manager.c:780
 #: ../gnome-initial-setup/pages/account/um-realm-manager.c:794
-#: ../gnome-initial-setup/pages/password/um-realm-manager.c:821
-#: ../gnome-initial-setup/pages/password/um-realm-manager.c:835
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "无法以 %s 在 %s 域登录"
 
 #: ../gnome-initial-setup/pages/account/um-realm-manager.c:786
-#: ../gnome-initial-setup/pages/password/um-realm-manager.c:827
 msgid "Invalid password, please try again"
 msgstr "密码错误，请重试"
 
 #: ../gnome-initial-setup/pages/account/um-realm-manager.c:799
-#: ../gnome-initial-setup/pages/password/um-realm-manager.c:840
 #, c-format
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "无法连接到 %s 域：%s"
 
-#: ../gnome-initial-setup/pages/account/um-utils.c:236
-#: ../gnome-initial-setup/pages/password/um-utils.c:148
+#: ../gnome-initial-setup/pages/account/um-utils.c:245
 #, c-format
-msgid "A user with the username '%s' already exists"
+msgid "A user with the username '%s' already exists."
 msgstr "名为 %s 的用户已存在"
 
-#: ../gnome-initial-setup/pages/account/um-utils.c:240
-#: ../gnome-initial-setup/pages/password/um-utils.c:152
+#: ../gnome-initial-setup/pages/account/um-utils.c:249
 #, c-format
-msgid "The username is too long"
+msgid "The username is too long."
 msgstr "用户名太长"
 
-#: ../gnome-initial-setup/pages/account/um-utils.c:243
-#: ../gnome-initial-setup/pages/password/um-utils.c:155
-msgid "The username cannot start with a '-'"
+#: ../gnome-initial-setup/pages/account/um-utils.c:252
+msgid "The username cannot start with a '-'."
 msgstr "用户名不能以“-”开头"
 
-#: ../gnome-initial-setup/pages/account/um-utils.c:246
-#: ../gnome-initial-setup/pages/password/um-utils.c:158
+#: ../gnome-initial-setup/pages/account/um-utils.c:255
 msgid ""
-"The username must only consist of:\n"
-" ➣ letters from the English alphabet\n"
-" ➣ digits\n"
-" ➣ any of the characters '.', '-' and '_'"
-msgstr ""
-"用户名只能包含：\n"
-" ➣ 英文字母\n"
-" ➣ 数字\n"
-" ➣ “.”、“-”或“_”"
+"The username should only consist of lower and upper case letters from a-z, "
+"digits and any of characters '.', '-' and '_'."
+msgstr "用户名只能包含从a到z的大小写字母，数字和“.”、“-”和“_”几种字符。"
+
+#: ../gnome-initial-setup/pages/account/um-utils.c:259
+msgid "This will be used to name your home folder and can't be changed."
+msgstr "这将用于创建您的主目录并无法更改。"
 
 #: ../gnome-initial-setup/pages/eulas/gis-eula-page.c:301
 #: ../gnome-initial-setup/pages/eulas/gis-eula-page.ui.h:1
@@ -316,7 +276,7 @@ msgstr "选择您的键盘布局或者其他输入方式"
 msgid "No languages found"
 msgstr "未找到其他语言"
 
-#: ../gnome-initial-setup/pages/language/gis-language-page.c:213
+#: ../gnome-initial-setup/pages/language/gis-language-page.c:272
 msgid "Welcome"
 msgstr "欢迎"
 
@@ -351,40 +311,14 @@ msgstr ""
 "人。企业登录帐号也需要联网。"
 
 #: ../gnome-initial-setup/pages/network/gis-network-page.ui.h:3
-#| msgid "Network is not available."
 msgid "No wireless available"
 msgstr "无线不可用"
 
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.c:175
-#: ../gnome-initial-setup/pages/password/gis-password-page.c:121
-msgid "No password"
-msgstr "无密码"
-
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.c:180
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.c:272
-#: ../gnome-initial-setup/pages/password/gis-password-page.c:126
-#: ../gnome-initial-setup/pages/password/gis-password-page.c:212
-msgid "Passwords do not match"
+#: ../gnome-initial-setup/pages/password/gis-password-page.c:135
+msgid "The passwords do not match."
 msgstr "密码不匹配"
 
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.c:219
-#, c-format
-msgid "Strength: %s"
-msgstr "密码强度：%s"
-
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.ui.h:7
-#: ../gnome-initial-setup/pages/password/gis-password-page.ui.h:4
-msgid "_Confirm password"
-msgstr "确认密码(_C)"
-
-#: ../gnome-initial-setup/pages/password/gis-account-page-local.ui.h:8
-#: ../gnome-initial-setup/pages/password/gis-password-page.ui.h:5
-msgid ""
-"Try to use at least 8 different characters. Mix upper and lower case and use "
-"a number or two."
-msgstr "请尽量使用至少 8 个不同的字符，并混用大小写字母和数字。"
-
-#: ../gnome-initial-setup/pages/password/gis-password-page.c:269
+#: ../gnome-initial-setup/pages/password/gis-password-page.c:252
 msgid "Password"
 msgstr "密码"
 
@@ -396,39 +330,134 @@ msgstr "设置密码"
 msgid "Be careful not to lose your password."
 msgstr "请记好您的密码。"
 
-#: ../gnome-initial-setup/pages/password/gis-password-page.ui.h:3
-msgid "Choose a _password"
-msgstr "选择一个密码(_P)"
+#: ../gnome-initial-setup/pages/password/gis-password-page.ui.h:4
+msgid "_Verify"
+msgstr "查证(_V)"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:81
+msgctxt "Password hint"
+msgid "The new password needs to be different from the old one."
+msgstr "新密码需要跟旧密码不相同。"
 
+#: ../gnome-initial-setup/pages/password/pw-utils.c:83
+msgctxt "Password hint"
+msgid "Try changing some letters and numbers."
+msgstr "尝试在密码中更换一些字母和数字。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:85
 #: ../gnome-initial-setup/pages/password/pw-utils.c:93
-msgctxt "Password strength"
-msgid "Too short"
-msgstr "太短"
+msgctxt "Password hint"
+msgid "Try changing the password a bit more."
+msgstr "尝试多修改密码。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:87
+msgctxt "Password hint"
+msgid "A password without your user name would be stronger."
+msgstr "不包含你用户名的密码强度更强。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:89
+msgctxt "Password hint"
+msgid "Try to avoid using your name in the password."
+msgstr "尝试在密码中避免使用你的名字。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:91
+msgctxt "Password hint"
+msgid "Try to avoid some of the words included in the password."
+msgstr "尝试避免一些在密码中已经包含了的词。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:95
+msgctxt "Password hint"
+msgid "Try to avoid common words."
+msgstr "尝试在密码中避免使用常用的词。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:97
+msgctxt "Password hint"
+msgid "Try to avoid reordering existing words."
+msgstr "尝试在密码中避免重新整理已经存在的词。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:99
+msgctxt "Password hint"
+msgid "Try to use more numbers."
+msgstr "尝试在密码中使用更多的数字。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:101
+msgctxt "Password hint"
+msgid "Try to use more uppercase letters."
+msgstr "尝试在密码中使用更多的大写字母。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:103
+msgctxt "Password hint"
+msgid "Try to use more lowercase letters."
+msgstr "尝试在密码中使用更多的小写字母。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:105
+msgctxt "Password hint"
+msgid "Try to use more special characters, like punctuation."
+msgstr "尝试在密码中使用更多的特殊字符，比如标点符号。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:107
+msgctxt "Password hint"
+msgid "Try to use a mixture of letters, numbers and punctuation."
+msgstr "尝试在密码中混合使用字母，数字和标点符号。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:109
+msgctxt "Password hint"
+msgid "Try to avoid repeating the same character."
+msgstr "尝试在密码中避免重复同样的字符。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:111
+msgctxt "Password hint"
+msgid ""
+"Try to avoid repeating the same type of character: you need to mix up "
+"letters, numbers and punctuation."
+msgstr "尝试在密码中避免重复同样类型的字符:你需要混用字母，数字和标点符号。"
 
-#: ../gnome-initial-setup/pages/password/pw-utils.c:98
+#: ../gnome-initial-setup/pages/password/pw-utils.c:113
+msgctxt "Password hint"
+msgid "Try to avoid sequences like 1234 or abcd."
+msgstr "尝试在密码中避免类似1234或者abcd的序列。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:115
+msgctxt "Password hint"
+msgid "Try to add more letters, numbers and symbols."
+msgstr "尝试在密码中添加更多字母，数字和符号。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:117
+msgctxt "Password hint"
+msgid "Mix uppercase and lowercase and use a number or two."
+msgstr "密码需要大小写字母混用并使用一到两个数字。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:119
+msgctxt "Password hint"
+msgid ""
+"Good password! Adding more letters, numbers and punctuation will make it "
+"stronger."
+msgstr "密码强度较高！加上更多字母，数字和标点符号会让密码更强。"
+
+#: ../gnome-initial-setup/pages/password/pw-utils.c:141
 msgctxt "Password strength"
-msgid "Not good enough"
-msgstr "不够好"
+msgid "Strength: Weak"
+msgstr "密码强度: 弱"
 
-#: ../gnome-initial-setup/pages/password/pw-utils.c:107
+#: ../gnome-initial-setup/pages/password/pw-utils.c:145
 msgctxt "Password strength"
-msgid "Weak"
-msgstr "弱"
+msgid "Strength: Low"
+msgstr "密码强度: 低"
 
-#: ../gnome-initial-setup/pages/password/pw-utils.c:110
+#: ../gnome-initial-setup/pages/password/pw-utils.c:148
 msgctxt "Password strength"
-msgid "Fair"
-msgstr "一般"
+msgid "Strength: Medium"
+msgstr "密码强度: 中等"
 
-#: ../gnome-initial-setup/pages/password/pw-utils.c:113
+#: ../gnome-initial-setup/pages/password/pw-utils.c:151
 msgctxt "Password strength"
-msgid "Good"
-msgstr "好"
+msgid "Strength: Good"
+msgstr "密码强度: 较高"
 
-#: ../gnome-initial-setup/pages/password/pw-utils.c:116
+#: ../gnome-initial-setup/pages/password/pw-utils.c:154
 msgctxt "Password strength"
-msgid "Strong"
-msgstr "强"
+msgid "Strength: High"
+msgstr "密码强度: 高"
 
 #: ../gnome-initial-setup/pages/region/cc-region-chooser.c:220
 msgid "No regions found"
@@ -471,7 +500,14 @@ msgstr "准备好了"
 msgid "You're all set!"
 msgstr "一切都已就绪！"
 
-#: ../gnome-initial-setup/pages/timezone/gis-timezone-page.c:187
+#: ../gnome-initial-setup/pages/timezone/gis-timezone-page.c:183
+#, c-format
+msgid ""
+"We think that your time zone is %s. Press Next to continue or search for a "
+"city to manually set the time zone."
+msgstr "我们认为你的时区是 %s.按下一步继续或者手动搜索城市设置时区。"
+
+#: ../gnome-initial-setup/pages/timezone/gis-timezone-page.c:489
 #: ../gnome-initial-setup/pages/timezone/gis-timezone-page.ui.h:1
 msgid "Time Zone"
 msgstr "时区"
@@ -480,6 +516,42 @@ msgstr "时区"
 msgid "Please search for a nearby city"
 msgstr "请搜索就近的城市"
 
+#~ msgid "Your username cannot be changed after setup."
+#~ msgstr "您的用户名在设置完后将不能修改。"
+
+#~ msgid "No password"
+#~ msgstr "无密码"
+
+#~ msgid "_Confirm password"
+#~ msgstr "确认密码(_C)"
+
+#~ msgid "Choose a _password"
+#~ msgstr "选择一个密码(_P)"
+
+#~ msgctxt "Password strength"
+#~ msgid "Too short"
+#~ msgstr "太短"
+
+#~ msgctxt "Password strength"
+#~ msgid "Not good enough"
+#~ msgstr "不够好"
+
+#~ msgctxt "Password strength"
+#~ msgid "Weak"
+#~ msgstr "弱"
+
+#~ msgctxt "Password strength"
+#~ msgid "Fair"
+#~ msgstr "一般"
+
+#~ msgctxt "Password strength"
+#~ msgid "Good"
+#~ msgstr "好"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strong"
+#~ msgstr "强"
+
 #~ msgid "Login"
 #~ msgstr "登录"
 
@@ -489,9 +561,6 @@ msgstr "请搜索就近的城市"
 #~ msgid "Create a Local Account"
 #~ msgstr "建立本地帐号"
 
-#~ msgid "This will be used to name your home folder and can't be changed."
-#~ msgstr "这将用于创建您的主目录并无法更改。"
-
 #~ msgid "Other"
 #~ msgstr "其他"