diff --git a/po/zh_CN.po b/po/zh_CN.po
index d5d3233..975530c 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-10-08 23:08-0400\n"
-"PO-Revision-Date: 2017-10-05 14:50+0000\n"
-"Last-Translator: Guillaume Roguez\n"
+"POT-Creation-Date: 2017-11-19 22:09-0500\n"
+"PO-Revision-Date: 2017-11-17 15:07+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"
@@ -21,588 +21,151 @@
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/accountadvancedtab.cpp:389
-msgid "_Remove server"
-msgstr "删除服务器(_R)"
+#: ui/ringgearsmenu.ui:13
+msgid "_About"
+msgstr "关于(_A)"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:302
-msgid "Hostname"
-msgstr "主机名"
+#: ui/ringgearsmenu.ui:19
+msgid "_Quit"
+msgstr "退出(_Q)"
 
-#: src/accountadvancedtab.cpp:510 ui/accountadvancedtab.ui:314
-msgid "Port"
-msgstr "端口"
+#: ui/choosecontactview.ui:34
+msgid "Create New"
+msgstr "创建新"
 
-#: src/accountaudiotab.cpp:175 src/accountvideotab.cpp:184
-msgid "Enabled"
-msgstr "启用"
+#: ui/accountmigrationview.ui:14
+msgid "Account migration required"
+msgstr "需要帐户迁移"
 
-#: src/accountaudiotab.cpp:181
-msgctxt "Name of the codec"
-msgid "Name"
-msgstr "姓名"
+#: ui/accountmigrationview.ui:39
+msgid "Alias:"
+msgstr "别名："
 
-#: src/accountaudiotab.cpp:185 src/accountvideotab.cpp:194
-msgid "Bitrate"
-msgstr "比特率"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr "请输入您的密码："
 
-#: src/accountaudiotab.cpp:189
-msgid "Samplerate"
-msgstr "采样率"
+#: ui/accountmigrationview.ui:129
+msgid "Migrate account"
+msgstr "迁移帐户"
 
-#: src/accountcreationwizard.cpp:231
-msgid ""
-"Your account was created, but we could not register your username. Try again"
-" from the settings menu."
-msgstr "您的帐户已建立，但无法注册您的用户名。请前往“设置”菜单重试。"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr "迁移失败。密码错误？"
 
-#: src/accountcreationwizard.cpp:275
-msgctxt "The default username / account alias, if none is set by the user"
-msgid "Unknown"
-msgstr "未知"
+#: ui/currentcallview.ui:251
+msgid "End this call"
+msgstr "结束该通话"
 
-#: src/accountcreationwizard.cpp:468
-msgid "Passwords don't match"
-msgstr "密码不匹配"
+#: ui/currentcallview.ui:255 ui/currentcallview.ui:457
+msgid "End call"
+msgstr "结束通话"
 
-#: src/accountdevicestab.cpp:195 src/usernameregistrationbox.cpp:404
-msgid "Bad password"
-msgstr "密码错误"
+#: ui/currentcallview.ui:275
+msgid "Toggle hold"
+msgstr "等待/取消等待"
 
-#: src/accountdevicestab.cpp:201
-msgid "Network error, try again"
-msgstr "网络错误，请重试"
+#: ui/currentcallview.ui:279 ui/currentcallview.ui:304
+#: ui/currentcallview.ui:448
+msgid "Hold"
+msgstr "等待"
 
-#: src/accountdevicestab.cpp:213
-msgid "Could not initiate export to the Ring, try again"
-msgstr "无法导出至Ring，请重试"
+#: ui/currentcallview.ui:300
+msgid "Toggle mute audio"
+msgstr "开启声音/静音"
 
-#: src/accountdevicestab.cpp:246
-msgctxt "Device Name Column"
-msgid "Name"
-msgstr "姓名"
+#: ui/currentcallview.ui:325
+msgid "Toggle mute video"
+msgstr "开启/关闭视频"
 
-#: src/accountdevicestab.cpp:251
-msgctxt "Device ID Column"
-msgid "ID"
-msgstr "ID"
+#: ui/currentcallview.ui:329 ui/currentcallview.ui:439
+msgid "Mute video"
+msgstr "关闭视频"
 
-#: src/accountgeneraltab.cpp:183 src/accountgeneraltab.cpp:208
-#: ui/accountgeneraltab.ui:159 ui/accountgeneraltab.ui:245
-msgid "Change password"
-msgstr ""
+#: ui/currentcallview.ui:352
+msgid "Toggle record audio"
+msgstr "音频录制开始/结束"
 
-#: src/accountgeneraltab.cpp:196
-msgid "New password and its confirmation are different"
-msgstr ""
+#: ui/currentcallview.ui:355
+msgid "Record audio"
+msgstr "录音"
 
-#: src/accountgeneraltab.cpp:206
-msgid "Password changed!"
-msgstr ""
+#: ui/currentcallview.ui:376
+msgid "Adjust outgoing video quality"
+msgstr "设置我的视频画质"
 
-#: src/accountgeneraltab.cpp:209
-msgid "Incorrect password"
-msgstr ""
+#: ui/currentcallview.ui:381 ui/currentcallview.ui:466
+msgid "Video quality"
+msgstr "视频画质"
 
-#: src/accountgeneraltab.cpp:236
-msgid "Alias"
-msgstr "别名"
+#: ui/currentcallview.ui:400
+msgid "Toggle show chat"
+msgstr "显示/隐藏聊天栏"
 
-#: src/accountgeneraltab.cpp:247
-msgid "Type"
-msgstr "类别"
+#: ui/currentcallview.ui:404 ui/currentcallview.ui:421
+msgid "Chat"
+msgstr "聊天"
 
-#: src/accountgeneraltab.cpp:273
-msgid "auto-generating..."
-msgstr "自动生成中…"
+#: ui/currentcallview.ui:430
+msgid "Mute audio"
+msgstr "静音"
 
-#: src/accountgeneraltab.cpp:286 src/accountgeneraltab.cpp:312
-msgid "Username"
-msgstr "用户名"
+#: ui/currentcallview.ui:475
+msgid "Record"
+msgstr "录制"
 
-#: src/accountgeneraltab.cpp:322
-msgid "Password"
-msgstr "密码"
+#: ui/accountdevicestab.ui:21
+msgid "My Device ID:"
+msgstr "我的设备ID："
 
-#: src/accountgeneraltab.cpp:335
-msgid "Show password"
-msgstr "显示密码"
-
-#: src/accountgeneraltab.cpp:341
-msgid "Proxy"
-msgstr "代理"
-
-#: src/accountgeneraltab.cpp:351
-msgid "Voicemail number"
-msgstr "语音信箱号码"
-
-#: src/accountgeneraltab.cpp:363
-msgid "Name service URL"
-msgstr "名称服务器URL"
-
-#: src/accountgeneraltab.cpp:376
-msgid "Auto-answer calls"
-msgstr "自动应答来电"
-
-#: src/accountgeneraltab.cpp:384
-msgid "UPnP enabled"
-msgstr "UPnP已启用"
-
-#: src/accountimportexportview.cpp:99
-msgid "Select account export location"
-msgstr "选择帐户导出路径"
-
-#: src/accountimportexportview.cpp:102 ui/accountcreationwizard.ui:84
-#: ui/accountdevicestab.ui:135 ui/accountimportexportview.ui:161
-msgid "Cancel"
-msgstr "取消"
-
-#: src/accountimportexportview.cpp:104
-msgid "Select"
-msgstr "选择"
-
-#: src/accountimportexportview.cpp:198
-msgid "Error importing account(s)"
-msgstr "帐户导入错误"
-
-#: src/accountimportexportview.cpp:245
-msgid "Error exporting account(s)"
-msgstr "帐户导出错误"
-
-#: src/accountvideotab.cpp:190
-msgctxt "The name of the codec"
-msgid "Name"
-msgstr "姓名"
-
-#: src/accountview.cpp:168
-msgctxt "Account settings"
-msgid "General"
-msgstr "通用"
-
-#: src/accountview.cpp:176
-msgctxt "Account settings"
+#: ui/accountdevicestab.ui:40
 msgid "Devices"
 msgstr "设备"
 
-#: src/accountview.cpp:182
-msgctxt "Account settings"
-msgid "Security"
-msgstr "安全"
+#: ui/accountdevicestab.ui:66
+msgid "Add device"
+msgstr "添加设备"
 
-#: src/accountview.cpp:187
-msgctxt "Account settings"
-msgid "Advanced"
-msgstr "高级"
+#: ui/accountdevicestab.ui:83
+msgid "Add New Device"
+msgstr "添加新设备"
 
-#: src/accountview.cpp:194
-msgctxt "List of banned peers"
-msgid "Bans"
-msgstr "已屏蔽用户"
-
-#: src/accountview.cpp:250
-#, c-format
-msgid "Are you sure you want to delete account \"%s\"?"
-msgstr "确定删除帐户“%s”吗？"
-
-#: src/accountview.cpp:377
-msgid "New Account"
-msgstr "新帐户"
-
-#: src/accountview.cpp:527
-msgctxt "Account state column"
-msgid "Enabled"
-msgstr "已启用"
-
-#: src/accountview.cpp:533
-msgctxt "Account alias (name) column"
-msgid "Alias"
-msgstr "别名"
-
-#: src/accountview.cpp:541
-msgctxt "Account status column"
-msgid "Status"
-msgstr "状态"
-
-#: src/avatarmanipulation.cpp:380
-msgid "Open Avatar Image"
-msgstr "打开头像图片"
-
-#: src/avatarmanipulation.cpp:383
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: src/avatarmanipulation.cpp:385
-msgid "_Open"
-msgstr "打开(_O)"
-
-#: src/backends/edscontactbackend.cpp:193
-msgid "Unknown EDS addressbook"
-msgstr "未知EDS地址簿"
-
-#: src/backends/edscontactbackend.cpp:213
-msgctxt "Backend type"
-msgid "Contacts"
-msgstr "通讯录"
-
-#: src/contactpopupmenu.cpp:172
-msgid "_Call"
-msgstr "呼叫(_C)"
-
-#: src/contactpopupmenu.cpp:175
-msgid "_Copy name"
-msgstr "复制名称(_C)"
-
-#: src/contactpopupmenu.cpp:178
-msgid "_Copy number"
-msgstr "复制号码(_C)"
-
-#: src/contactpopupmenu.cpp:181
-msgid "_Add to contact"
-msgstr "添加至通讯录(_A)"
-
-#: src/contactpopupmenu.cpp:184
-msgid "_Remove contact"
-msgstr "删除联系人(_R)"
-
-#: src/dialogs.c:53
-msgid "Working..."
-msgstr "正在工作…"
-
-#: src/dialogs.c:84
-#, c-format
-msgctxt "Do not translate the release name nor the status (beta, final, ...)"
+#: ui/accountdevicestab.ui:98
 msgid ""
-"Liberté, Égalité, Fraternité - Version 1.0\n"
-"built on %.25s"
-msgstr "自由、平等、博爱 - 版本 1.0\nbuilt on %.25s"
+"To add a new device to your Ring account, you export your account on the "
+"Ring. This will generate a pin that must be entered on your new device "
+"within 5 minutes of its generation."
+msgstr "要在新设备上添加您的Ring帐户，您需要使用Ring导出该帐户。您会获得一个PIN，并且有5分钟时间将该PIN输入您的新设备。"
 
-#: src/dialogs.c:136
-msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Ring：GNOME客户端\nRing是自由软件，尊重用户的通讯自由与隐私。"
+#: ui/accountdevicestab.ui:107 ui/accountimportexportview.ui:111
+msgid "Password (required):"
+msgstr "密码（必填）："
 
-#: src/editcontactview.cpp:208
-msgctxt "Phone number category"
-msgid "home"
-msgstr "主页"
+#: ui/accountdevicestab.ui:118 ui/accountimportexportview.ui:126
+msgid "Enter archive password"
+msgstr "输入档案密码"
 
-#: src/generalsettingsview.cpp:103
-msgid ""
-"This is a destructive operation. Are you sure you want to delete all of your"
-" chat and call history?"
-msgstr "该操作不可撤销。确定删除您的所有聊天与通话记录吗？"
+#: ui/accountdevicestab.ui:135 ui/accountcreationwizard.ui:84
+#: ui/accountimportexportview.ui:161 src/accountimportexportview.cpp:102
+msgid "Cancel"
+msgstr "取消"
 
-#: src/historyview.cpp:293
-msgctxt "Call history"
-msgid "Call"
-msgstr "通话"
+#: ui/accountdevicestab.ui:141
+msgid "Export on the Ring"
+msgstr "Ring导出"
 
-#: src/historyview.cpp:338
-msgctxt "Call history"
-msgid "Date"
-msgstr "日期"
+#: ui/accountdevicestab.ui:162
+msgid "Exporting account on the Ring..."
+msgstr "Ring正在导出帐户…"
 
-#: src/ringnotify.cpp:148
-msgid "Incoming call"
-msgstr "来电"
+#: ui/accountdevicestab.ui:186
+msgid "Your generated pin:"
+msgstr "您的PIN："
 
-#: src/ringnotify.cpp:165 src/ringnotify.cpp:343
-msgctxt "notification action name"
-msgid "Show"
-msgstr "显示"
-
-#: src/ringnotify.cpp:267
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s说："
-
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "开启调试模式"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "恢复主窗口的隐藏状态（仅应用于主实例）"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Ring的GNOME客户端"
-
-#: src/ringmainwindow.cpp:614
-#, c-format
-msgid "Invalid Ring username: %s"
-msgstr "Ring用户名非法：%s"
-
-#: src/ringmainwindow.cpp:629
-msgid "Error resolving username, nameserver is possibly unreachable"
-msgstr "用户名解析错误，或因服务器故障"
-
-#: src/ringmainwindow.cpp:643
-#, c-format
-msgid "Could not resolve Ring username: %s"
-msgstr "无法解析Ring用户名：%s"
-
-#: src/ringmainwindow.cpp:1152
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "拨出"
-
-#: src/ringmainwindow.cpp:1154
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "发起聊天"
-
-#: src/ringmainwindow.cpp:1234
-#, c-format
-msgctxt "string format will be replaced by the account alias"
-msgid "%s..."
-msgstr "%s…"
-
-#: src/ringmainwindow.cpp:1240
-#, c-format
-msgctxt "string format will be replaced by the account alias"
-msgid "%s (error)"
-msgstr "%s(错误)"
-
-#: src/ringmainwindow.cpp:1443
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Search contacts or enter number"
-msgstr "查找通讯录或输入号码"
-
-#: src/ringwelcomeview.cpp:75
-msgid ""
-"This is your Ring username.\n"
-"Copy and share it with your friends!"
-msgstr "这是您的Ring用户名。\n复制并发送给您的朋友！"
-
-#: src/ringwelcomeview.cpp:83
-msgctxt "Do not translate \"RingID\""
-msgid ""
-"This is your RingID.\n"
-"Copy and share it with your friends!"
-msgstr "这是您的RingID。\n复制并发送给您的朋友！"
-
-#: src/ringwelcomeview.cpp:90
-msgid "fetching RingID..."
-msgstr "正在获取RingID…"
-
-#: src/ringwelcomeview.cpp:148
-msgid ""
-"Ring is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Ring是自由软件，尊重用户的通讯自由与隐私。"
-
-#: src/ringwelcomeview.cpp:202
-msgctxt "Do not translate \"Ring ID\""
-msgid "Ring ID QR code"
-msgstr "RingID二维码"
-
-#: src/usernameregistrationbox.cpp:128
-msgid "The entered username is not available"
-msgstr "该用户名不可用"
-
-#: src/usernameregistrationbox.cpp:129
-msgid "Username is not available"
-msgstr "用户名不可用"
-
-#: src/usernameregistrationbox.cpp:138
-msgid "The entered username is not valid"
-msgstr "该用户名非法"
-
-#: src/usernameregistrationbox.cpp:139
-msgid "Username is not valid"
-msgstr "用户名非法"
-
-#: src/usernameregistrationbox.cpp:148
-msgid "The entered username is available"
-msgstr "该用户名可用"
-
-#: src/usernameregistrationbox.cpp:149
-msgid "Username is available"
-msgstr "用户名可用"
-
-#: src/usernameregistrationbox.cpp:158
-msgid "Failed to perform lookup"
-msgstr "无法进行查找"
-
-#: src/usernameregistrationbox.cpp:159
-msgid "Could not lookup username"
-msgstr "无法查找用户名"
-
-#: src/usernameregistrationbox.cpp:248
-msgid "Looking up username availability..."
-msgstr "正在检测用户名是否可用…"
-
-#: src/usernameregistrationbox.cpp:310 ui/accountcreationwizard.ui:487
-msgid "Registering username..."
-msgstr "正在注册用户名…"
-
-#: src/usernameregistrationbox.cpp:319
-msgid "Could not initiate name registration, try again."
-msgstr "无法进行用户名注册，请重试。"
-
-#: src/usernameregistrationbox.cpp:361
-msgid "Register this username on the blockchain"
-msgstr "在区块链上注册该用户名"
-
-#: src/usernameregistrationbox.cpp:397
-msgid "Invalid username"
-msgstr "非法用户名"
-
-#: src/usernameregistrationbox.cpp:411
-msgid "Username already taken"
-msgstr "用户名已被占用"
-
-#: src/usernameregistrationbox.cpp:418
-msgid "Network error"
-msgstr "网络错误"
-
-#: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
-msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring错误"
-
-#: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)..."
-msgstr "正在重试连接Ring守护进程（dring）…"
-
-#: src/native/dbuserrorhandler.cpp:87
-msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "无法连接至Ring守护进程（dring）。\nRing将立即退出。"
-
-#: src/video/video_widget.cpp:525
-msgid "Share screen area"
-msgstr "共享屏幕区域"
-
-#: src/video/video_widget.cpp:535
-msgid "Share file"
-msgstr "共享文件"
-
-#: src/video/video_widget.cpp:549
-msgid "Show advanced information"
-msgstr "显示高级信息"
-
-#: ui/accountadvancedtab.ui:81
-msgid "Registration expire timeout (seconds):"
-msgstr "注册超时（秒）："
-
-#: ui/accountadvancedtab.ui:103
-msgid "Allow calls from unknown peers"
-msgstr "允许未知来电"
-
-#: ui/accountadvancedtab.ui:117
-msgid "Allow calls from peers in your call history"
-msgstr "允许历史记录再次来电"
-
-#: ui/accountadvancedtab.ui:131
-msgid "Allow calls from peers in your contacts list"
-msgstr "允许通讯录来电"
-
-#: ui/accountadvancedtab.ui:149
-msgid "Registration"
-msgstr "注册"
-
-#: ui/accountadvancedtab.ui:178
-msgid "Use random port"
-msgstr "使用随机端口"
-
-#: ui/accountadvancedtab.ui:199
-msgid "Local port:"
-msgstr "本地端口："
-
-#: ui/accountadvancedtab.ui:225
-msgid "Network Interface"
-msgstr "网络接口"
-
-#: ui/accountadvancedtab.ui:253
-msgid "Same as local parameters"
-msgstr "与本地配置相同"
-
-#: ui/accountadvancedtab.ui:268
-msgid "Set published address and port:"
-msgstr "设置公开地址与端口："
-
-#: ui/accountadvancedtab.ui:292
-msgid "Address"
-msgstr "地址："
-
-#: ui/accountadvancedtab.ui:340
-msgid "Use STUN"
-msgstr "使用STUN"
-
-#: ui/accountadvancedtab.ui:363 ui/accountadvancedtab.ui:412
-msgid "server URL"
-msgstr "服务器URL"
-
-#: ui/accountadvancedtab.ui:389
-msgid "Use TURN"
-msgstr "使用TURN"
-
-#: ui/accountadvancedtab.ui:434
-msgid "username"
-msgstr "用户名"
-
-#: ui/accountadvancedtab.ui:455
-msgid "password"
-msgstr "密码"
-
-#: ui/accountadvancedtab.ui:479
-msgid "realm"
-msgstr "域"
-
-#: ui/accountadvancedtab.ui:508
-msgid "Published Address"
-msgstr "公开地址"
-
-#: ui/accountadvancedtab.ui:536
-msgid "Bootstrap Servers"
-msgstr "初始服务器"
-
-#: ui/accountadvancedtab.ui:593
-msgid ""
-"These settings are only used during SDP session negotiation in case ICE is "
-"not supported by the server or peer."
-msgstr "该设置仅用于SDP协议握手，仅当服务器或客户端不支持ICE协议时生效。"
-
-#: ui/accountadvancedtab.ui:618 ui/accountadvancedtab.ui:694
-msgid "Min"
-msgstr "最小"
-
-#: ui/accountadvancedtab.ui:641 ui/accountadvancedtab.ui:717
-msgid "Max"
-msgstr "最大"
-
-#: ui/accountadvancedtab.ui:665
-msgid "Audio RTP Port Range"
-msgstr "音频RTP端口范围"
-
-#: ui/accountadvancedtab.ui:741
-msgid "Video RTP Port Range"
-msgstr "视频RTP端口范围"
-
-#: ui/accountadvancedtab.ui:759
-msgid "SDP Session Negotiation (ICE Fallback)"
-msgstr "SDP协议握手（当ICE协议不受支持）"
-
-#: ui/accountaudiotab.ui:57 ui/accountvideotab.ui:80
-msgid "Up"
-msgstr "上"
-
-#: ui/accountaudiotab.ui:64 ui/accountvideotab.ui:87
-msgid "Down"
-msgstr "下"
-
-#: ui/accountaudiotab.ui:75
-msgid "Audio Codecs"
-msgstr "音频编码"
+#: ui/accountdevicestab.ui:217 ui/accountdevicestab.ui:239
+#: ui/accountcreationwizard.ui:551
+msgid "OK"
+msgstr "确定"
 
 #: ui/accountcreationwizard.ui:34
 msgid "Welcome to"
@@ -696,6 +259,10 @@
 msgid "Generating your Ring account..."
 msgstr "正在生成您的Ring帐户…"
 
+#: ui/accountcreationwizard.ui:487 src/usernameregistrationbox.cpp:310
+msgid "Registering username..."
+msgstr "正在注册用户名…"
+
 #: ui/accountcreationwizard.ui:494
 msgid "This may take a few minutes."
 msgstr "可能需要数分钟。"
@@ -708,77 +275,141 @@
 msgid "Error creating/loading account."
 msgstr "创建或载入帐户时发生错误。"
 
-#: ui/accountcreationwizard.ui:551 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239
-msgid "OK"
-msgstr "确定"
+#: ui/generalsettingsview.ui:34
+msgid "Profile Settings"
+msgstr "帐户设置"
 
-#: ui/accountdevicestab.ui:21
-msgid "My Device ID:"
-msgstr "我的设备ID："
+#: ui/generalsettingsview.ui:76
+msgid "Ring Settings"
+msgstr "Ring设置"
 
-#: ui/accountdevicestab.ui:40
-msgid "Devices"
-msgstr "设备"
+#: ui/generalsettingsview.ui:92
+msgid "Start Ring on login"
+msgstr "登录时自动启动Ring"
 
-#: ui/accountdevicestab.ui:66
-msgid "Add device"
-msgstr "添加设备"
+#: ui/generalsettingsview.ui:100
+msgid "Show Ring icon in the notification area (systray)."
+msgstr "在系统托盘中显示Ring图标。"
 
-#: ui/accountdevicestab.ui:83
-msgid "Add New Device"
-msgstr "添加新设备"
+#: ui/generalsettingsview.ui:108
+msgid "Bring Ring to the foreground on incoming calls."
+msgstr "来电时将Ring切换到前台。"
 
-#: ui/accountdevicestab.ui:98
-msgid ""
-"To add a new device to your Ring account, you export your account on the "
-"Ring. This will generate a pin that must be entered on your new device "
-"within 5 minutes of its generation."
-msgstr "要在新设备上添加您的Ring帐户，您需要使用Ring导出该帐户。您会获得一个PIN，并且有5分钟时间将该PIN输入您的新设备。"
+#: ui/generalsettingsview.ui:116
+msgid "Enable notifications for incoming calls."
+msgstr "启用来电通知。"
 
-#: ui/accountdevicestab.ui:107 ui/accountimportexportview.ui:111
-msgid "Password (required):"
-msgstr "密码（必填）："
+#: ui/generalsettingsview.ui:124
+msgid "Enable notifications for new chat messages."
+msgstr "启用新消息通知。"
 
-#: ui/accountdevicestab.ui:118 ui/accountimportexportview.ui:126
-msgid "Enter archive password"
-msgstr "输入档案密码"
+#: ui/generalsettingsview.ui:132
+msgid "Show images and videos in chat window."
+msgstr "在聊天窗口中显示图片和视频"
 
-#: ui/accountdevicestab.ui:141
-msgid "Export on the Ring"
-msgstr "Ring导出"
+#: ui/generalsettingsview.ui:140
+msgid "Entering a number in the search entry will place a new call."
+msgstr "要直接拨打电话号码，请在搜索栏中输入该号码。"
 
-#: ui/accountdevicestab.ui:162
-msgid "Exporting account on the Ring..."
-msgstr "Ring正在导出帐户…"
+#: ui/generalsettingsview.ui:155
+msgid "Show chat on the right."
+msgstr "在右侧显示聊天窗口。"
 
-#: ui/accountdevicestab.ui:186
-msgid "Your generated pin:"
-msgstr "您的PIN："
+#: ui/generalsettingsview.ui:161
+msgid "Show chat on the bottom."
+msgstr "在下方显示聊天窗口。"
 
-#: ui/accountgeneraltab.ui:69
-msgid "Account"
+#: ui/generalsettingsview.ui:185
+msgid "History Settings"
+msgstr "历史记录设置"
+
+#: ui/generalsettingsview.ui:203
+msgid "Keep history for (days):"
+msgstr "历史记录保存天数："
+
+#: ui/generalsettingsview.ui:224
+msgid "(set to 0 for unlimited history)"
+msgstr "（设置为0则无限制）"
+
+#: ui/generalsettingsview.ui:234
+msgid "Clear all history"
+msgstr "清除所有历史记录"
+
+#: ui/ringmainwindow.ui:61
+msgid "Menu"
+msgstr "菜单"
+
+#: ui/ringmainwindow.ui:83
+msgid "General"
+msgstr "通用"
+
+#: ui/ringmainwindow.ui:98
+msgid "Media"
+msgstr "媒体"
+
+#: ui/ringmainwindow.ui:114
+msgid "Accounts"
 msgstr "帐户"
 
-#: ui/accountgeneraltab.ui:135
-msgid "Parameters"
-msgstr "参数"
+#: ui/ringmainwindow.ui:157
+msgid "Settings"
+msgstr "设置"
 
-#: ui/accountgeneraltab.ui:175
-msgid "Note: this will change the password only on this device."
-msgstr ""
+#: ui/ringmainwindow.ui:266 ui/ringmainwindow.ui:273
+msgid "Conversations"
+msgstr "会话"
 
-#: ui/accountgeneraltab.ui:194
-msgid "Current password"
-msgstr ""
+#: ui/ringmainwindow.ui:299 ui/ringmainwindow.ui:306
+msgid "Contact requests"
+msgstr "联系人请求"
 
-#: ui/accountgeneraltab.ui:214
-msgid "New password"
-msgstr "新密码"
+#: ui/mediasettingsview.ui:24
+msgid "Audio Settings"
+msgstr "音频设置"
 
-#: ui/accountgeneraltab.ui:234
-msgid "Confirm password"
-msgstr "确认密码"
+#: ui/mediasettingsview.ui:40
+msgid "Audio manager:"
+msgstr "音频管理器："
+
+#: ui/mediasettingsview.ui:52
+msgid "Ringtone device:"
+msgstr "响铃设备："
+
+#: ui/mediasettingsview.ui:64
+msgid "Output device:"
+msgstr "输出设备："
+
+#: ui/mediasettingsview.ui:76
+msgid "Input device:"
+msgstr "输入设备："
+
+#: ui/mediasettingsview.ui:134
+msgid "Camera Settings"
+msgstr "视频设置"
+
+#: ui/mediasettingsview.ui:150
+msgid "Device:"
+msgstr "设备："
+
+#: ui/mediasettingsview.ui:162
+msgid "Channel:"
+msgstr "通道："
+
+#: ui/mediasettingsview.ui:174
+msgid "Resolution:"
+msgstr "分辨率："
+
+#: ui/mediasettingsview.ui:186
+msgid "Frame rate:"
+msgstr "帧率："
+
+#: ui/mediasettingsview.ui:244
+msgid "Hardware Acceleration"
+msgstr "硬件加速"
+
+#: ui/mediasettingsview.ui:260
+msgid "Enable hardware decoding:"
+msgstr "启用硬件解码："
 
 #: ui/accountimportexportview.ui:14
 msgid "Export selected account"
@@ -812,25 +443,260 @@
 msgid "Import"
 msgstr "倒入"
 
-#: ui/accountmigrationview.ui:14
-msgid "Account migration required"
-msgstr "需要帐户迁移"
+#: ui/accountview.ui:42 ui/accountview.ui:45
+msgid "Remove selected account"
+msgstr "移除所选帐户"
 
-#: ui/accountmigrationview.ui:39
-msgid "Alias:"
-msgstr "别名："
+#: ui/accountview.ui:63 ui/accountview.ui:66
+msgid "Add new account"
+msgstr "添加新帐户"
 
-#: ui/accountmigrationview.ui:102
-msgid "Please enter your password:"
-msgstr "请输入您的密码："
+#: ui/accountview.ui:75 ui/accountview.ui:78
+msgid "Select account type"
+msgstr "选择帐户类型"
 
-#: ui/accountmigrationview.ui:129
-msgid "Migrate account"
-msgstr "迁移帐户"
+#: ui/accountview.ui:104
+msgid "Import archived account(s)"
+msgstr "导入已归档帐户"
 
-#: ui/accountmigrationview.ui:148
-msgid "Migration failed, wrong password ?"
-msgstr "迁移失败。密码错误？"
+#: ui/accountview.ui:112
+msgid "Export selected account(s)"
+msgstr "导出所选帐户"
+
+#: ui/editcontactview.ui:12
+msgid "Select addressbook"
+msgstr "选择地址簿"
+
+#: ui/editcontactview.ui:15
+msgid "Addressbook"
+msgstr "地址簿"
+
+#: ui/editcontactview.ui:29
+msgid "Name"
+msgstr "姓名"
+
+#: ui/editcontactview.ui:32
+msgid "Contact name"
+msgstr "联系人名称"
+
+#: ui/editcontactview.ui:47
+msgid "Select how this number will be categorized"
+msgstr "选择该号码如何归类"
+
+#: ui/editcontactview.ui:50
+msgid "Number category"
+msgstr "号码类别"
+
+#: ui/editcontactview.ui:66
+msgid "Number or Ring ID to be added"
+msgstr "要添加的号码或RingID"
+
+#: ui/editcontactview.ui:72
+msgid "Number or Ring ID"
+msgstr "号码或RingID"
+
+#: ui/editcontactview.ui:83
+msgid "Save"
+msgstr "保存"
+
+#: ui/accountvideotab.ui:50
+msgid "Enable Video"
+msgstr "启用视频"
+
+#: ui/accountvideotab.ui:80 ui/accountaudiotab.ui:57
+msgid "Up"
+msgstr "上"
+
+#: ui/accountvideotab.ui:87 ui/accountaudiotab.ui:64
+msgid "Down"
+msgstr "下"
+
+#: ui/accountvideotab.ui:98
+msgid "Video Codecs"
+msgstr "视频编码"
+
+#: ui/accountadvancedtab.ui:81
+msgid "Registration expire timeout (seconds):"
+msgstr "注册超时（秒）："
+
+#: ui/accountadvancedtab.ui:103
+msgid "Allow calls from unknown peers"
+msgstr "允许未知来电"
+
+#: ui/accountadvancedtab.ui:117
+msgid "Allow calls from peers in your call history"
+msgstr "允许历史记录再次来电"
+
+#: ui/accountadvancedtab.ui:131
+msgid "Allow calls from peers in your contacts list"
+msgstr "允许通讯录来电"
+
+#: ui/accountadvancedtab.ui:149
+msgid "Registration"
+msgstr "注册"
+
+#: ui/accountadvancedtab.ui:178
+msgid "Use random port"
+msgstr "使用随机端口"
+
+#: ui/accountadvancedtab.ui:199
+msgid "Local port:"
+msgstr "本地端口："
+
+#: ui/accountadvancedtab.ui:225
+msgid "Network Interface"
+msgstr "网络接口"
+
+#: ui/accountadvancedtab.ui:253
+msgid "Same as local parameters"
+msgstr "与本地配置相同"
+
+#: ui/accountadvancedtab.ui:268
+msgid "Set published address and port:"
+msgstr "设置公开地址与端口："
+
+#: ui/accountadvancedtab.ui:292
+msgid "Address"
+msgstr "地址："
+
+#: ui/accountadvancedtab.ui:314 src/accountadvancedtab.cpp:510
+msgid "Port"
+msgstr "端口"
+
+#: ui/accountadvancedtab.ui:340
+msgid "Use STUN"
+msgstr "使用STUN"
+
+#: ui/accountadvancedtab.ui:363 ui/accountadvancedtab.ui:412
+msgid "server URL"
+msgstr "服务器URL"
+
+#: ui/accountadvancedtab.ui:389
+msgid "Use TURN"
+msgstr "使用TURN"
+
+#: ui/accountadvancedtab.ui:434
+msgid "username"
+msgstr "用户名"
+
+#: ui/accountadvancedtab.ui:455
+msgid "password"
+msgstr "密码"
+
+#: ui/accountadvancedtab.ui:479
+msgid "realm"
+msgstr "域"
+
+#: ui/accountadvancedtab.ui:508
+msgid "Published Address"
+msgstr "公开地址"
+
+#: ui/accountadvancedtab.ui:536
+msgid "Bootstrap Servers"
+msgstr "初始服务器"
+
+#: ui/accountadvancedtab.ui:593
+msgid ""
+"These settings are only used during SDP session negotiation in case ICE is "
+"not supported by the server or peer."
+msgstr "该设置仅用于SDP协议握手，仅当服务器或客户端不支持ICE协议时生效。"
+
+#: ui/accountadvancedtab.ui:618 ui/accountadvancedtab.ui:694
+msgid "Min"
+msgstr "最小"
+
+#: ui/accountadvancedtab.ui:641 ui/accountadvancedtab.ui:717
+msgid "Max"
+msgstr "最大"
+
+#: ui/accountadvancedtab.ui:665
+msgid "Audio RTP Port Range"
+msgstr "音频RTP端口范围"
+
+#: ui/accountadvancedtab.ui:741
+msgid "Video RTP Port Range"
+msgstr "视频RTP端口范围"
+
+#: ui/accountadvancedtab.ui:759
+msgid "SDP Session Negotiation (ICE Fallback)"
+msgstr "SDP协议握手（当ICE协议不受支持）"
+
+#: ui/accountaudiotab.ui:75
+msgid "Audio Codecs"
+msgstr "音频编码"
+
+#: ui/usernameregistrationbox.ui:12
+msgid "enter username here"
+msgstr "在此处输入用户名"
+
+#: ui/usernameregistrationbox.ui:24
+msgid "Register"
+msgstr "注册"
+
+#: ui/accountbanstab.ui:18
+msgid "List of banned peers :"
+msgstr ""
+
+#: ui/accountbanstab.ui:62
+msgid "unban"
+msgstr ""
+
+#: ui/chatview.ui:19 ui/chatview.ui:22
+msgid "Hide chat view"
+msgstr "隐藏聊天界面"
+
+#: ui/chatview.ui:45 ui/chatview.ui:48
+msgid "Place call"
+msgstr "发起通话"
+
+#: ui/chatview.ui:60
+msgid "Add to conversations"
+msgstr ""
+
+#: ui/chatview.ui:119
+msgid "Send Invitation"
+msgstr "发送邀请"
+
+#: ui/accountgeneraltab.ui:69
+msgid "Account"
+msgstr "帐户"
+
+#: ui/accountgeneraltab.ui:135
+msgid "Parameters"
+msgstr "参数"
+
+#: ui/accountgeneraltab.ui:159 ui/accountgeneraltab.ui:245
+#: src/accountgeneraltab.cpp:183 src/accountgeneraltab.cpp:208
+msgid "Change password"
+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/incomingcallview.ui:99
+msgid "Incoming..."
+msgstr "来电…"
+
+#: ui/incomingcallview.ui:135
+msgid "Accept"
+msgstr "接听"
+
+#: ui/incomingcallview.ui:156
+msgid "Reject"
+msgstr "拒绝"
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -904,34 +770,6 @@
 msgid "Negotiation Encryption"
 msgstr "协商加密"
 
-#: ui/accountvideotab.ui:50
-msgid "Enable Video"
-msgstr "启用视频"
-
-#: ui/accountvideotab.ui:98
-msgid "Video Codecs"
-msgstr "视频编码"
-
-#: ui/accountview.ui:42 ui/accountview.ui:45
-msgid "Remove selected account"
-msgstr "移除所选帐户"
-
-#: ui/accountview.ui:63 ui/accountview.ui:66
-msgid "Add new account"
-msgstr "添加新帐户"
-
-#: ui/accountview.ui:75 ui/accountview.ui:78
-msgid "Select account type"
-msgstr "选择帐户类型"
-
-#: ui/accountview.ui:104
-msgid "Import archived account(s)"
-msgstr "导入已归档帐户"
-
-#: ui/accountview.ui:112
-msgid "Export selected account(s)"
-msgstr "导出所选帐户"
-
 #: ui/avatarmanipulation.ui:92 ui/avatarmanipulation.ui:125
 msgid "Take photo"
 msgstr "拍照"
@@ -948,295 +786,448 @@
 msgid "Set selection as image"
 msgstr "设置选区为头像"
 
-#: ui/chatview.ui:19 ui/chatview.ui:22
-msgid "Hide chat view"
-msgstr "隐藏聊天界面"
+#: src/ring_client.cpp:147
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Ring daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
 
-#: ui/chatview.ui:45 ui/chatview.ui:48
-msgid "Place call"
-msgstr "发起通话"
+#: src/ring_client.cpp:150
+msgid "Ring Error"
+msgstr "Ring错误"
 
-#: ui/chatview.ui:60
-msgid "Send invitation"
-msgstr "发送邀请"
+#: src/ring_client.cpp:292
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Ring main window"
+msgid "Show Ring"
+msgstr ""
 
-#: ui/chatview.ui:130
-msgid "Send Invitation"
-msgstr "发送邀请"
+#: src/ring_client.cpp:296
+msgid "Quit"
+msgstr ""
 
-#: ui/choosecontactview.ui:34
-msgid "Create New"
-msgstr "创建新"
+#: src/ringnotify.cpp:148
+msgid "Incoming call"
+msgstr "来电"
 
-#: ui/currentcallview.ui:251
-msgid "End this call"
-msgstr "结束该通话"
+#: src/ringnotify.cpp:165 src/ringnotify.cpp:343
+msgctxt "notification action name"
+msgid "Show"
+msgstr "显示"
 
-#: ui/currentcallview.ui:255 ui/currentcallview.ui:459
-msgid "End call"
-msgstr "结束通话"
+#: src/ringnotify.cpp:267
+#, c-format
+msgctxt "Text message notification"
+msgid "%s says:"
+msgstr "%s说："
 
-#: ui/currentcallview.ui:276
-msgid "Toggle hold"
-msgstr "等待/取消等待"
+#: src/accountimportexportview.cpp:99
+msgid "Select account export location"
+msgstr "选择帐户导出路径"
 
-#: ui/currentcallview.ui:280 ui/currentcallview.ui:306
-#: ui/currentcallview.ui:450
-msgid "Hold"
-msgstr "等待"
+#: src/accountimportexportview.cpp:104
+msgid "Select"
+msgstr "选择"
 
-#: ui/currentcallview.ui:302
-msgid "Toggle mute audio"
-msgstr "开启声音/静音"
+#: src/accountimportexportview.cpp:197
+msgid "Error importing account(s)"
+msgstr "帐户导入错误"
 
-#: ui/currentcallview.ui:328
-msgid "Toggle mute video"
-msgstr "开启/关闭视频"
+#: src/accountimportexportview.cpp:244
+msgid "Error exporting account(s)"
+msgstr "帐户导出错误"
 
-#: ui/currentcallview.ui:332 ui/currentcallview.ui:441
-msgid "Mute video"
-msgstr "关闭视频"
+#: src/usernameregistrationbox.cpp:128
+msgid "The entered username is not available"
+msgstr "该用户名不可用"
 
-#: ui/currentcallview.ui:355
-msgid "Toggle record audio"
-msgstr "音频录制开始/结束"
+#: src/usernameregistrationbox.cpp:129
+msgid "Username is not available"
+msgstr "用户名不可用"
 
-#: ui/currentcallview.ui:358
-msgid "Record audio"
-msgstr "录音"
+#: src/usernameregistrationbox.cpp:138
+msgid "The entered username is not valid"
+msgstr "该用户名非法"
 
-#: ui/currentcallview.ui:378
-msgid "Adjust outgoing video quality"
-msgstr "设置我的视频画质"
+#: src/usernameregistrationbox.cpp:139
+msgid "Username is not valid"
+msgstr "用户名非法"
 
-#: ui/currentcallview.ui:383 ui/currentcallview.ui:468
-msgid "Video quality"
-msgstr "视频画质"
+#: src/usernameregistrationbox.cpp:148
+msgid "The entered username is available"
+msgstr "该用户名可用"
 
-#: ui/currentcallview.ui:402
-msgid "Toggle show chat"
-msgstr "显示/隐藏聊天栏"
+#: src/usernameregistrationbox.cpp:149
+msgid "Username is available"
+msgstr "用户名可用"
 
-#: ui/currentcallview.ui:406 ui/currentcallview.ui:423
-msgid "Chat"
-msgstr "聊天"
+#: src/usernameregistrationbox.cpp:158
+msgid "Failed to perform lookup"
+msgstr "无法进行查找"
 
-#: ui/currentcallview.ui:432
-msgid "Mute audio"
-msgstr "静音"
+#: src/usernameregistrationbox.cpp:159
+msgid "Could not lookup username"
+msgstr "无法查找用户名"
 
-#: ui/currentcallview.ui:477
-msgid "Record"
-msgstr "录制"
+#: src/usernameregistrationbox.cpp:248
+msgid "Looking up username availability..."
+msgstr "正在检测用户名是否可用…"
 
-#: ui/editcontactview.ui:12
-msgid "Select addressbook"
-msgstr "选择地址簿"
+#: src/usernameregistrationbox.cpp:319
+msgid "Could not initiate name registration, try again."
+msgstr "无法进行用户名注册，请重试。"
 
-#: ui/editcontactview.ui:15
-msgid "Addressbook"
-msgstr "地址簿"
+#: src/usernameregistrationbox.cpp:361
+msgid "Register this username on the blockchain"
+msgstr "在区块链上注册该用户名"
 
-#: ui/editcontactview.ui:29
-msgid "Name"
-msgstr "姓名"
+#: src/usernameregistrationbox.cpp:397
+msgid "Invalid username"
+msgstr "非法用户名"
 
-#: ui/editcontactview.ui:32
-msgid "Contact name"
-msgstr "联系人名称"
+#: src/usernameregistrationbox.cpp:404 src/accountdevicestab.cpp:195
+msgid "Bad password"
+msgstr "密码错误"
 
-#: ui/editcontactview.ui:47
-msgid "Select how this number will be categorized"
-msgstr "选择该号码如何归类"
+#: src/usernameregistrationbox.cpp:411
+msgid "Username already taken"
+msgstr "用户名已被占用"
 
-#: ui/editcontactview.ui:50
-msgid "Number category"
-msgstr "号码类别"
+#: src/usernameregistrationbox.cpp:418
+msgid "Network error"
+msgstr "网络错误"
 
-#: ui/editcontactview.ui:66
-msgid "Number or Ring ID to be added"
-msgstr "要添加的号码或RingID"
-
-#: ui/editcontactview.ui:72
-msgid "Number or Ring ID"
-msgstr "号码或RingID"
-
-#: ui/editcontactview.ui:83
-msgid "Save"
-msgstr "保存"
-
-#: ui/generalsettingsview.ui:34
-msgid "Profile Settings"
-msgstr "帐户设置"
-
-#: ui/generalsettingsview.ui:76
-msgid "Ring Settings"
-msgstr "Ring设置"
-
-#: ui/generalsettingsview.ui:92
-msgid "Start Ring on login"
-msgstr "登录时自动启动Ring"
-
-#: ui/generalsettingsview.ui:100
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "在系统托盘中显示Ring图标。"
-
-#: ui/generalsettingsview.ui:108
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "来电时将Ring切换到前台。"
-
-#: ui/generalsettingsview.ui:116
-msgid "Enable notifications for incoming calls."
-msgstr "启用来电通知。"
-
-#: ui/generalsettingsview.ui:124
-msgid "Enable notifications for new chat messages."
-msgstr "启用新消息通知。"
-
-#: ui/generalsettingsview.ui:132
-msgid "Show images and videos in chat window."
-msgstr "在聊天窗口中显示图片和视频"
-
-#: ui/generalsettingsview.ui:140
-msgid "Entering a number in the search entry will place a new call."
-msgstr "要直接拨打电话号码，请在搜索栏中输入该号码。"
-
-#: ui/generalsettingsview.ui:155
-msgid "Show chat on the right."
-msgstr "在右侧显示聊天窗口。"
-
-#: ui/generalsettingsview.ui:161
-msgid "Show chat on the bottom."
-msgstr "在下方显示聊天窗口。"
-
-#: ui/generalsettingsview.ui:185
-msgid "History Settings"
-msgstr "历史记录设置"
-
-#: ui/generalsettingsview.ui:203
-msgid "Keep history for (days):"
-msgstr "历史记录保存天数："
-
-#: ui/generalsettingsview.ui:224
-msgid "(set to 0 for unlimited history)"
-msgstr "（设置为0则无限制）"
-
-#: ui/generalsettingsview.ui:234
-msgid "Clear all history"
-msgstr "清除所有历史记录"
-
-#: ui/incomingcallview.ui:106
-msgid "Incoming..."
-msgstr "来电…"
-
-#: ui/incomingcallview.ui:142
-msgid "Accept"
-msgstr "接听"
-
-#: ui/incomingcallview.ui:163
-msgid "Reject"
-msgstr "拒绝"
-
-#: ui/incomingcallview.ui:186
-msgid "Hang up"
-msgstr "挂断"
-
-#: ui/mediasettingsview.ui:24
-msgid "Audio Settings"
-msgstr "音频设置"
-
-#: ui/mediasettingsview.ui:40
-msgid "Audio manager:"
-msgstr "音频管理器："
-
-#: ui/mediasettingsview.ui:52
-msgid "Ringtone device:"
-msgstr "响铃设备："
-
-#: ui/mediasettingsview.ui:64
-msgid "Output device:"
-msgstr "输出设备："
-
-#: ui/mediasettingsview.ui:76
-msgid "Input device:"
-msgstr "输入设备："
-
-#: ui/mediasettingsview.ui:134
-msgid "Camera Settings"
-msgstr "视频设置"
-
-#: ui/mediasettingsview.ui:150
-msgid "Device:"
-msgstr "设备："
-
-#: ui/mediasettingsview.ui:162
-msgid "Channel:"
-msgstr "通道："
-
-#: ui/mediasettingsview.ui:174
-msgid "Resolution:"
-msgstr "分辨率："
-
-#: ui/mediasettingsview.ui:186
-msgid "Frame rate:"
-msgstr "帧率："
-
-#: ui/mediasettingsview.ui:244
-msgid "Hardware Acceleration"
-msgstr "硬件加速"
-
-#: ui/mediasettingsview.ui:260
-msgid "Enable hardware decoding:"
-msgstr "启用硬件解码："
-
-#: ui/ringgearsmenu.ui:13
-msgid "_About"
-msgstr "关于(_A)"
-
-#: ui/ringgearsmenu.ui:19
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: ui/ringmainwindow.ui:17
-msgid "Menu"
-msgstr "菜单"
-
-#: ui/ringmainwindow.ui:51
-msgid "General"
-msgstr "通用"
-
-#: ui/ringmainwindow.ui:61
-msgid "Media"
-msgstr "媒体"
-
-#: ui/ringmainwindow.ui:72
-msgid "Accounts"
-msgstr "帐户"
-
-#: ui/ringmainwindow.ui:102
-msgid "Settings"
-msgstr "设置"
+#: src/generalsettingsview.cpp:103
+msgid ""
+"This is a destructive operation. Are you sure you want to delete all of your"
+" chat and call history?"
+msgstr "该操作不可撤销。确定删除您的所有聊天与通话记录吗？"
 
-#: ui/ringmainwindow.ui:215
-msgid "Conversations"
-msgstr "会话"
+#: src/backends/edscontactbackend.cpp:193
+msgid "Unknown EDS addressbook"
+msgstr "未知EDS地址簿"
 
-#: ui/ringmainwindow.ui:237
+#: src/backends/edscontactbackend.cpp:213
+msgctxt "Backend type"
 msgid "Contacts"
 msgstr "通讯录"
 
-#: ui/ringmainwindow.ui:259
-msgid "History"
-msgstr "历史记录"
+#: src/accountadvancedtab.cpp:389
+msgid "_Remove server"
+msgstr "删除服务器(_R)"
 
-#: ui/ringmainwindow.ui:281
-msgid "Contact requests"
-msgstr "联系人请求"
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:302
+msgid "Hostname"
+msgstr "主机名"
 
-#: ui/usernameregistrationbox.ui:12
-msgid "enter username here"
-msgstr "在此处输入用户名"
+#: src/accountgeneraltab.cpp:196
+msgid "New password and its confirmation are different"
+msgstr ""
 
-#: ui/usernameregistrationbox.ui:24
-msgid "Register"
-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:247
+msgid "Type"
+msgstr "类别"
+
+#: src/accountgeneraltab.cpp:273
+msgid "auto-generating..."
+msgstr "自动生成中…"
+
+#: src/accountgeneraltab.cpp:286 src/accountgeneraltab.cpp:312
+msgid "Username"
+msgstr "用户名"
+
+#: src/accountgeneraltab.cpp:322
+msgid "Password"
+msgstr "密码"
+
+#: src/accountgeneraltab.cpp:335
+msgid "Show password"
+msgstr "显示密码"
+
+#: src/accountgeneraltab.cpp:341
+msgid "Proxy"
+msgstr "代理"
+
+#: src/accountgeneraltab.cpp:351
+msgid "Voicemail number"
+msgstr "语音信箱号码"
+
+#: src/accountgeneraltab.cpp:363
+msgid "Name service URL"
+msgstr "名称服务器URL"
+
+#: src/accountgeneraltab.cpp:376
+msgid "Auto-answer calls"
+msgstr "自动应答来电"
+
+#: src/accountgeneraltab.cpp:384
+msgid "UPnP enabled"
+msgstr "UPnP已启用"
+
+#: src/video/video_widget.cpp:532
+msgid "Share screen area"
+msgstr "共享屏幕区域"
+
+#: src/video/video_widget.cpp:543
+msgid "Share file"
+msgstr "共享文件"
+
+#: src/video/video_widget.cpp:556
+msgid "Show advanced information"
+msgstr "显示高级信息"
+
+#: src/avatarmanipulation.cpp:380
+msgid "Open Avatar Image"
+msgstr "打开头像图片"
+
+#: src/avatarmanipulation.cpp:383
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: src/avatarmanipulation.cpp:385
+msgid "_Open"
+msgstr "打开(_O)"
+
+#: src/dialogs.c:53
+msgid "Working..."
+msgstr "正在工作…"
+
+#: src/dialogs.c:84
+#, c-format
+msgctxt "Do not translate the release name nor the status (beta, final, ...)"
+msgid ""
+"Liberté, Égalité, Fraternité - Version 1.0\n"
+"built on %.25s"
+msgstr "自由、平等、博爱 - 版本 1.0\nbuilt on %.25s"
+
+#: src/dialogs.c:136
+msgid ""
+"The GNOME client for Ring.\n"
+"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr "Ring：GNOME客户端\nRing是自由软件，尊重用户的通讯自由与隐私。"
+
+#: src/accountdevicestab.cpp:201
+msgid "Network error, try again"
+msgstr "网络错误，请重试"
+
+#: src/accountdevicestab.cpp:213
+msgid "Could not initiate export to the Ring, try again"
+msgstr "无法导出至Ring，请重试"
+
+#: src/accountdevicestab.cpp:246
+msgctxt "Device Name Column"
+msgid "Name"
+msgstr "姓名"
+
+#: src/accountdevicestab.cpp:251
+msgctxt "Device ID Column"
+msgid "ID"
+msgstr "ID"
+
+#: src/ringmainwindow.cpp:839
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "拨出"
+
+#: src/ringmainwindow.cpp:841
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "发起聊天"
+
+#: src/ringmainwindow.cpp:1165
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Search contacts or enter number"
+msgstr "查找通讯录或输入号码"
+
+#: src/editcontactview.cpp:208
+msgctxt "Phone number category"
+msgid "home"
+msgstr "主页"
+
+#: src/accountvideotab.cpp:184 src/accountaudiotab.cpp:175
+msgid "Enabled"
+msgstr "启用"
+
+#: src/accountvideotab.cpp:190
+msgctxt "The name of the codec"
+msgid "Name"
+msgstr "姓名"
+
+#: src/accountvideotab.cpp:194 src/accountaudiotab.cpp:185
+msgid "Bitrate"
+msgstr "比特率"
+
+#: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
+msgctxt "Name of error window (dialog)"
+msgid "Ring Error"
+msgstr "Ring错误"
+
+#: src/native/dbuserrorhandler.cpp:57
+msgid "Trying to reconnect to the Ring daemon (dring)..."
+msgstr "正在重试连接Ring守护进程（dring）…"
+
+#: src/native/dbuserrorhandler.cpp:87
+msgid ""
+"Could not re-connect to the Ring daemon (dring).\n"
+"Ring will now quit."
+msgstr "无法连接至Ring守护进程（dring）。\nRing将立即退出。"
+
+#: src/accountaudiotab.cpp:181
+msgctxt "Name of the codec"
+msgid "Name"
+msgstr "姓名"
+
+#: src/accountaudiotab.cpp:189
+msgid "Samplerate"
+msgstr "采样率"
+
+#: src/conversationpopupmenu.cpp:147
+msgid "_Place call"
+msgstr ""
+
+#: src/conversationpopupmenu.cpp:153
+msgid "_Add to conversations"
+msgstr ""
+
+#: src/conversationpopupmenu.cpp:157
+msgid "_Discard invitation"
+msgstr ""
+
+#: src/conversationpopupmenu.cpp:160
+msgid "_Block invitations"
+msgstr ""
+
+#: src/conversationpopupmenu.cpp:165
+msgid "_Clear history"
+msgstr ""
+
+#: src/conversationpopupmenu.cpp:168
+msgid "_Remove conversation"
+msgstr ""
+
+#: src/conversationpopupmenu.cpp:171
+msgid "_Block contact"
+msgstr ""
+
+#: src/ring_client_options.c:66
+msgid "Enable debug"
+msgstr "开启调试模式"
+
+#: src/ring_client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "恢复主窗口的隐藏状态（仅应用于主实例）"
+
+#: src/ring_client_options.c:85
+msgid "- GNOME client for Ring"
+msgstr "- Ring的GNOME客户端"
+
+#: 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:275
+msgctxt "The default username / account alias, if none is set by the user"
+msgid "Unknown"
+msgstr "未知"
+
+#: src/accountcreationwizard.cpp:471
+msgid "Passwords don't match"
+msgstr "密码不匹配"
+
+#: src/ringwelcomeview.cpp:88
+msgid ""
+"This is your Ring username.\n"
+"Copy and share it with your friends!"
+msgstr "这是您的Ring用户名。\n复制并发送给您的朋友！"
+
+#: src/ringwelcomeview.cpp:96
+msgctxt "Do not translate \"RingID\""
+msgid ""
+"This is your RingID.\n"
+"Copy and share it with your friends!"
+msgstr "这是您的RingID。\n复制并发送给您的朋友！"
+
+#: src/ringwelcomeview.cpp:151
+msgid ""
+"Ring is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Ring是自由软件，尊重用户的通讯自由与隐私。"
+
+#: src/ringwelcomeview.cpp:205
+msgctxt "Do not translate \"Ring ID\""
+msgid "Ring ID QR code"
+msgstr "RingID二维码"
+
+#: src/currentcallview.cpp:535
+msgctxt "Enable automatic video quality"
+msgid "Auto"
+msgstr "自动"
+
+#: src/accountview.cpp:168
+msgctxt "Account settings"
+msgid "General"
+msgstr "通用"
+
+#: src/accountview.cpp:176
+msgctxt "Account settings"
+msgid "Devices"
+msgstr "设备"
+
+#: src/accountview.cpp:182
+msgctxt "Account settings"
+msgid "Security"
+msgstr "安全"
+
+#: src/accountview.cpp:187
+msgctxt "Account settings"
+msgid "Advanced"
+msgstr "高级"
+
+#: src/accountview.cpp:194
+msgctxt "List of banned peers"
+msgid "Bans"
+msgstr "已屏蔽用户"
+
+#: src/accountview.cpp:250
+#, c-format
+msgid "Are you sure you want to delete account \"%s\"?"
+msgstr "确定删除帐户“%s”吗？"
+
+#: src/accountview.cpp:377
+msgid "New Account"
+msgstr "新帐户"
+
+#: src/accountview.cpp:527
+msgctxt "Account state column"
+msgid "Enabled"
+msgstr "已启用"
+
+#: src/accountview.cpp:533
+msgctxt "Account alias (name) column"
+msgid "Alias"
+msgstr "别名"
+
+#: src/accountview.cpp:541
+msgctxt "Account status column"
+msgid "Status"
+msgstr "状态"