i18n: automatic bump
Change-Id: I6bb6f88af5399d53c61e842e3ebb01b8ad686e48
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d09d849..06d7e65 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,9 +11,9 @@
msgstr ""
"Project-Id-Version: Ring\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-10 23:09-0400\n"
-"PO-Revision-Date: 2017-08-06 09:47+0000\n"
-"Last-Translator: 李文睿 <happy.lwr@gmail.com>\n"
+"POT-Creation-Date: 2017-09-24 23:09-0400\n"
+"PO-Revision-Date: 2017-09-25 03:09+0000\n"
+"Last-Translator: Alexandre Lision\n"
"Language-Team: Chinese (China) (http://www.transifex.com/savoirfairelinux/ring/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@
msgid "_Remove server"
msgstr "删除服务器(_R)"
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:251
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:302
msgid "Hostname"
msgstr "主机名"
@@ -50,18 +50,18 @@
msgid "Samplerate"
msgstr "采样率"
-#: src/accountcreationwizard.cpp:240
+#: src/accountcreationwizard.cpp:231
msgid ""
"Your account was created, but we could not register your username. Try again"
" from the settings menu."
msgstr "您的帐户已建立，但无法注册您的用户名。请前往“设置”菜单重试。"
-#: src/accountcreationwizard.cpp:283
+#: src/accountcreationwizard.cpp:275
msgctxt "The default username / account alias, if none is set by the user"
msgid "Unknown"
msgstr "未知"
-#: src/accountcreationwizard.cpp:461
+#: src/accountcreationwizard.cpp:468
msgid "Passwords don't match"
msgstr "密码不匹配"
@@ -87,47 +87,64 @@
msgid "ID"
msgstr "ID"
-#: src/accountgeneraltab.cpp:185
+#: src/accountgeneraltab.cpp:183 src/accountgeneraltab.cpp:208
+#: ui/accountgeneraltab.ui:159 ui/accountgeneraltab.ui:245
+msgid "Change password"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:196
+msgid "New password and its confirmation are different"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:206
+msgid "Password changed!"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:209
+msgid "Incorrect password"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:236
msgid "Alias"
msgstr "别名"
-#: src/accountgeneraltab.cpp:196
+#: src/accountgeneraltab.cpp:247
msgid "Type"
msgstr "类别"
-#: src/accountgeneraltab.cpp:222
+#: src/accountgeneraltab.cpp:273
msgid "auto-generating..."
msgstr "自动生成中…"
-#: src/accountgeneraltab.cpp:235 src/accountgeneraltab.cpp:261
+#: src/accountgeneraltab.cpp:286 src/accountgeneraltab.cpp:312
msgid "Username"
msgstr "用户名"
-#: src/accountgeneraltab.cpp:271
+#: src/accountgeneraltab.cpp:322
msgid "Password"
msgstr "密码"
-#: src/accountgeneraltab.cpp:284
+#: src/accountgeneraltab.cpp:335
msgid "Show password"
msgstr "显示密码"
-#: src/accountgeneraltab.cpp:290
+#: src/accountgeneraltab.cpp:341
msgid "Proxy"
msgstr "代理"
-#: src/accountgeneraltab.cpp:300
+#: src/accountgeneraltab.cpp:351
msgid "Voicemail number"
msgstr "语音信箱号码"
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:363
msgid "Name service URL"
msgstr "名称服务器URL"
-#: src/accountgeneraltab.cpp:325
+#: src/accountgeneraltab.cpp:376
msgid "Auto-answer calls"
msgstr "自动应答来电"
-#: src/accountgeneraltab.cpp:333
+#: src/accountgeneraltab.cpp:384
msgid "UPnP enabled"
msgstr "UPnP已启用"
@@ -144,11 +161,11 @@
msgid "Select"
msgstr "选择"
-#: src/accountimportexportview.cpp:211
+#: src/accountimportexportview.cpp:198
msgid "Error importing account(s)"
msgstr "帐户导入错误"
-#: src/accountimportexportview.cpp:263
+#: src/accountimportexportview.cpp:245
msgid "Error exporting account(s)"
msgstr "帐户导出错误"
@@ -607,36 +624,37 @@
msgid "Link this devices to a Ring account created on another device"
msgstr "将此设备与其他设备创建的Ring帐户进行连接"
-#: ui/accountcreationwizard.ui:105 ui/accountcreationwizard.ui:159
+#: ui/accountcreationwizard.ui:105
msgid "Link this device to an existing account"
msgstr "将此设备与已有帐户进行连接"
#: ui/accountcreationwizard.ui:120
msgid ""
-"To link this device to another account, you first need to obtain a PIN code."
-" To generate the pin code, go to the account management setting of a "
-"previous device, choose the Ring Account to use and select \"Link another "
-"device to this account\". You will get the necessary PIN to complete this "
-"form. The PIN is only valid for 10 minutes."
-msgstr "要将此设备连接至另一帐户，您需要一个PIN。请在该帐户的原有设备上，前往“帐户管理”，选择该Ring帐户并点击“将另一设备与该帐户进行连接”以获得PIN，将其填写在这里。您获得的PIN将在10分钟内有效。"
+"To link this device to another account, you have two possibilities. You can "
+"import your account from the DHT, but first, you need to obtain a PIN code. "
+"To generate the PIN code, go to the account management setting of a previous"
+" device, choose the Ring Account to use and select \"Link another device to "
+"this account\". You will get the necessary PIN to complete this form. The "
+"PIN is only valid for 10 minutes. Or, you can directly import your account "
+"from an archive."
+msgstr ""
-#: ui/accountcreationwizard.ui:128 ui/accountcreationwizard.ui:217
-#: ui/accountcreationwizard.ui:429
-msgid "Previous"
-msgstr "上一步"
-
-#: ui/accountcreationwizard.ui:136
-msgid "Okay, I have the PIN!"
-msgstr "我已获得PIN"
-
-#: ui/accountcreationwizard.ui:174
+#: ui/accountcreationwizard.ui:146
msgid "Enter your pin:"
msgstr "输入您的PIN："
+#: ui/accountcreationwizard.ui:174
+msgid "Or import a file:"
+msgstr ""
+
#: ui/accountcreationwizard.ui:193
msgid "Enter your password:"
msgstr "输入您的密码："
+#: ui/accountcreationwizard.ui:217 ui/accountcreationwizard.ui:429
+msgid "Previous"
+msgstr "上一步"
+
#: ui/accountcreationwizard.ui:225 ui/accountcreationwizard.ui:437
msgid "Next"
msgstr "下一步"
@@ -742,10 +760,26 @@
msgid "Account"
msgstr "帐户"
-#: ui/accountgeneraltab.ui:126
+#: ui/accountgeneraltab.ui:135
msgid "Parameters"
msgstr "参数"
+#: ui/accountgeneraltab.ui:175
+msgid "Note: this will change the password only on this device."
+msgstr ""
+
+#: ui/accountgeneraltab.ui:194
+msgid "Current password"
+msgstr ""
+
+#: ui/accountgeneraltab.ui:214
+msgid "New password"
+msgstr ""
+
+#: ui/accountgeneraltab.ui:234
+msgid "Confirm password"
+msgstr ""
+
#: ui/accountimportexportview.ui:14
msgid "Export selected account"
msgstr "导出所选的帐户"