i18n: automatic bump

Change-Id: I5ce22de2417369ab1ec1799b0cc56fee3e542d30
diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts
index ce80d51..8a9dcb1 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -1,572 +1,639 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
         <location filename="../aboutdialog.ui" line="462"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>关于</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="475"/>
         <source>Credits</source>
+        <translation>致谢</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
-        <translation type="unfinished"/>
+        <translation>Ring的Microsoft Windows客户端。
+Ring是安全的、分布式的通讯软件。</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
-        <translation type="unfinished"/>
+        <translation>版本</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
-        <translation type="unfinished"/>
+        <translation>开发者:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
-        <translation type="unfinished"/>
+        <translation>界面设计:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
-        <translation type="unfinished"/>
+        <translation>基于SFLPhone项目</translation>
     </message>
 </context>
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>设置</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation>通用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>帐户</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
-        <translation type="unfinished"/>
+        <translation>类别</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
-        <translation type="unfinished"/>
+        <translation>别名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
-        <translation type="unfinished"/>
+        <translation>参数</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
-        <translation type="unfinished"/>
+        <translation>主机名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
-        <translation type="unfinished"/>
+        <translation>用户名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation>密码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
-        <translation type="unfinished"/>
+        <translation>代理</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
-        <translation type="unfinished"/>
+        <translation>语音信箱号码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
+        <translation>自动应答</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
-        <translation type="unfinished"/>
+        <translation>UPnP已启用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
+        <translation>允许未知来电</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
+        <translation>允许通讯录来电</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
+        <translation>允许历史记录再次来电</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>名称服务器URL</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
+        <translation>Ring帐户设置</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
+        <translation>铃声选择</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
-        <translation type="unfinished"/>
+        <translation>播放</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"/>
+        <translation>音频/视频</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
-        <translation type="unfinished"/>
+        <translation>音频编码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
-        <translation type="unfinished"/>
+        <translation>视频编码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
-        <translation type="unfinished"/>
+        <translation>高级</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
-        <translation type="unfinished"/>
+        <translation>注册</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
+        <translation>注册超时(秒):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
-        <translation type="unfinished"/>
+        <translation>网络接口</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
-        <translation type="unfinished"/>
+        <translation>本地端口:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
-        <translation type="unfinished"/>
+        <translation>与本地配置相同</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
-        <translation type="unfinished"/>
+        <translation>设置公开地址与端口:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
-        <translation type="unfinished"/>
+        <translation>地址:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
-        <translation type="unfinished"/>
+        <translation>端口</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
-        <translation type="unfinished"/>
+        <translation>使用STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
-        <translation type="unfinished"/>
+        <translation>服务器URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
-        <translation type="unfinished"/>
+        <translation>使用TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
-        <translation type="unfinished"/>
+        <translation>域</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
+        <translation>SDP协议握手(当ICE协议不受支持)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
+        <translation>该设置仅用于SDP握手,仅当服务器或客户端不支持ICE时生效。</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation>音频RTP端口范围</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
-        <translation type="unfinished"/>
+        <translation>最小</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
-        <translation type="unfinished"/>
+        <translation>最大</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation>视频RTP端口范围</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
-        <translation type="unfinished"/>
+        <translation>安全</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
+        <translation>流媒体加密(SRTP)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>设备</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>添加设备</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <source>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.</source>
+        <translation>要在新设备上添加您的Ring帐户,您需要使用Ring导出该帐户。您会获得一个PIN,并且有5分钟时间将该PIN输入您的新设备。</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2267"/>
+        <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Ring导出</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>您的PIN:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2415"/>
+        <source>OK</source>
+        <translation>确定</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
-        <translation type="unfinished"/>
+        <translation>加密流媒体(SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
-        <translation type="unfinished"/>
+        <translation>公开地址</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
-        <translation type="unfinished"/>
+        <translation>颁发机构证书</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
-        <translation type="unfinished"/>
+        <translation>用户证书</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
-        <translation type="unfinished"/>
+        <translation>私钥</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
-        <translation type="unfinished"/>
+        <translation>私钥密码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
-        <translation type="unfinished"/>
+        <translation>使用默认加密算法</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
-        <translation type="unfinished"/>
+        <translation>暂停</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
+        <translation>选择文件</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation>文件 (*)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
-        <source>Files (*)</source>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>密码错误。</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>表单</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
-        <translation type="unfinished"/>
+        <translation>或输入号码…</translation>
     </message>
     <message>
         <location filename="../callutilsdialog.ui" line="104"/>
         <source>Transfer</source>
-        <translation type="unfinished"/>
+        <translation>传输</translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
+        <translation>查找通讯录或输入RingID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>会话</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>联系人请求</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
-        <translation type="unfinished"/>
+        <translation>设置菜单</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="627"/>
+        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
+        <translation>Ring是自由软件,尊重用户的通讯自由与隐私。</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;这是您的RingID。&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;复制并发送给您的朋友!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
-        <translation type="unfinished"/>
+        <translation>共享您的RingID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;双击复制&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
+        <translation>创建二维码时产生错误</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
-        <translation type="unfinished"/>
+        <translation>会话,与</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
-        <translation type="unfinished"/>
+        <translation>开始会话!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
+        <translation>发送消息</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
+        <translation>想要与您通信!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
-        <translation type="unfinished"/>
+        <translation>应答</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
-        <translation type="unfinished"/>
+        <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
-        <translation type="unfinished"/>
+        <translation>正在通话</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
-        <translation>打电话</translation>
+        <translation>通话</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
-        <translation type="unfinished"/>
+        <translation>复制号码</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
-        <translation type="unfinished"/>
+        <translation>加入通讯录</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
-        <translation type="unfinished"/>
+        <translation>在Ring上联系我</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation>我的RingID是:</translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="212"/>
-        <source>My RingId is : </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>复制</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation>显示日期</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation>显示作者</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>消息来自%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>复制名称</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
-        <translation type="unfinished"/>
+        <translation>通话号码</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
-        <translation type="unfinished"/>
+        <translation>复制号码</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
-        <translation type="unfinished"/>
+        <translation>复制%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
-        <translation type="unfinished"/>
+        <translation>呼叫%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
-        <translation type="unfinished"/>
+        <translation>未找到Ring帐户</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>来电:%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
-        <translation type="unfinished"/>
+        <translation>与%1的会话</translation>
     </message>
 </context>
 <context>
@@ -574,175 +641,172 @@
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>设置</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="100"/>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation>通用</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="171"/>
         <source>quit settings menu</source>
-        <translation type="unfinished"/>
+        <translation>退出设置菜单</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="331"/>
         <source>History Settings</source>
-        <translation type="unfinished"/>
+        <translation>历史记录设置</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="372"/>
         <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
+        <translation>历史记录保存天数</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="415"/>
         <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
+        <translation>(设置为0则无限制)</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="469"/>
         <source>Clear History</source>
-        <translation type="unfinished"/>
+        <translation>清除历史记录</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="615"/>
         <source>Misc. Settings</source>
-        <translation type="unfinished"/>
+        <translation>其他设置</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="637"/>
         <source>Keep minimized on close</source>
+        <translation>退出时保持窗口最小化</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
-        <translation type="unfinished"/>
+        <translation>视频</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="249"/>
         <source>Profile</source>
-        <translation type="unfinished"/>
+        <translation>帐户资料</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="299"/>
         <source>Name</source>
-        <translation type="unfinished"/>
+        <translation>姓名</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="506"/>
         <source>Record Settings</source>
-        <translation type="unfinished"/>
+        <translation>录音设置</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="539"/>
         <source>Save in :</source>
-        <translation type="unfinished"/>
+        <translation>保存至:</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="582"/>
         <source>Always Record</source>
+        <translation>总是录制</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="709"/>
-        <source>days</source>
-        <translation type="unfinished"/>
+        <translation>自动检查更新:每</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
+        <source>days</source>
+        <translation>天</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
+        <translation>通话时无法预览</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
-        <translation type="unfinished"/>
+        <translation>设备选择</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
-        <translation type="unfinished"/>
+        <translation>设备</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
-        <translation type="unfinished"/>
+        <translation>分辨率</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
-        <translation type="unfinished"/>
+        <translation>输出设备</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
-        <translation type="unfinished"/>
+        <translation>输入设备</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
-        <translation type="unfinished"/>
+        <translation>添加新帐户</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>倒入</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
-        <translation type="unfinished"/>
+        <translation>导出</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="132"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>帐户</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
+        <translation>系统启动时运行Ring</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
-        <translation type="unfinished"/>
+        <translation>新帐户</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
+        <translation>确定删除您的所有历史记录吗?</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="379"/>
         <source>Choose Directory</source>
-        <translation type="unfinished"/>
+        <translation>选择文件夹</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="409"/>
         <source>An error occured while importing account.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
+        <translation>导入帐户时发生错误。</translation>
     </message>
 </context>
 <context>
@@ -750,55 +814,134 @@
     <message>
         <location filename="../contactpicker.ui" line="33"/>
         <source>Existing Contact</source>
-        <translation type="unfinished"/>
+        <translation>已有联系人</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
         <source>Search...</source>
-        <translation type="unfinished"/>
+        <translation>搜索…</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
         <source>Create new contact</source>
-        <translation type="unfinished"/>
+        <translation>创建新通讯录</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="75"/>
         <source>New Contact</source>
-        <translation type="unfinished"/>
+        <translation>新通讯录</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="98"/>
         <source>Enter a name here...</source>
-        <translation type="unfinished"/>
+        <translation>在此处输入名称…</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="128"/>
         <source>Create</source>
+        <translation>创建</translation>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>表单</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>接听</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>屏蔽</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>表单</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="73"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be lost</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>确定</translation>
+    </message>
 </context>
 <context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
         <source>Send text message...</source>
-        <translation type="unfinished"/>
+        <translation>发送文字消息…</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="46"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>复制</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="52"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation>显示日期</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="56"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation>显示作者</translation>
     </message>
 </context>
 <context>
@@ -806,22 +949,22 @@
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Ring</source>
-        <translation>响铃</translation>
+        <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
-        <translation type="unfinished"/>
+        <translation>参数设置</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>退出</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>关于</translation>
     </message>
 </context>
 <context>
@@ -829,38 +972,38 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="26"/>
         <source>Path</source>
-        <translation type="unfinished"/>
+        <translation>路径</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="46"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation>密码</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="65"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>确定</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="72"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
         <source>Save File</source>
-        <translation type="unfinished"/>
+        <translation>保存文件</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="62"/>
         <location filename="../pathpassworddialog.cpp" line="67"/>
         <source>Ring archive files (*.ring)</source>
-        <translation type="unfinished"/>
+        <translation>Ring档案文件 (*.ring)</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="65"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation>打开文件</translation>
     </message>
 </context>
 <context>
@@ -868,27 +1011,27 @@
     <message>
         <location filename="../photoboothdialog.ui" line="14"/>
         <source>Photobooth</source>
-        <translation type="unfinished"/>
+        <translation>Photobooth</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.ui" line="58"/>
         <source>or</source>
-        <translation type="unfinished"/>
+        <translation>或</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.ui" line="71"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>倒入</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="59"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation>选择文件</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="61"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation>文件 (*)</translation>
     </message>
 </context>
 <context>
@@ -896,32 +1039,43 @@
     <message>
         <location filename="../utils.cpp" line="185"/>
         <source>No default mail client found</source>
-        <translation type="unfinished"/>
+        <translation>未找到默认邮件客户端</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ring帐户</translation>
     </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
-        <translation type="unfinished"/>
+        <translation>自动</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
+        <translation>表单</translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -930,114 +1084,241 @@
     <message>
         <location filename="../videooverlay.ui" line="42"/>
         <source>Call on Hold</source>
-        <translation type="unfinished"/>
+        <translation>通话等待中</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="119"/>
         <source>Hold / Unhold</source>
-        <translation type="unfinished"/>
+        <translation>等待/取消等待</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="154"/>
         <source>Chat</source>
-        <translation type="unfinished"/>
+        <translation>聊天</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="186"/>
         <source>Add person to call</source>
-        <translation type="unfinished"/>
+        <translation>将其他人加入通话</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="218"/>
         <source>Transfer call</source>
-        <translation type="unfinished"/>
+        <translation>转接通话</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="256"/>
         <source>Mute Mic</source>
-        <translation type="unfinished"/>
+        <translation>将麦克风静音</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="367"/>
         <source>Quality</source>
-        <translation type="unfinished"/>
+        <translation>质量</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="399"/>
         <source>Join Calls</source>
-        <translation type="unfinished"/>
+        <translation>加入通话</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
-        <translation type="unfinished"/>
+        <translation>名称标签</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
-        <translation type="unfinished"/>
+        <translation>加入通讯录</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
-        <translation type="unfinished"/>
+        <translation>用时</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
-        <translation type="unfinished"/>
+        <translation>00:00</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
-        <translation type="unfinished"/>
+        <translation>挂断</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="297"/>
         <source>Mute Video</source>
-        <translation type="unfinished"/>
+        <translation>关闭视频</translation>
     </message>
 </context>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
-        <source>Share entire screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../videoview.cpp" line="235"/>
-        <source>Share screen area</source>
-        <translation type="unfinished"/>
+        <source>Share entire screen</source>
+        <translation>共享整个屏幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation>共享屏幕区域</translation>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
-        <translation type="unfinished"/>
+        <translation>共享文件</translation>
     </message>
 </context>
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>将此设备与一个帐户进行连接</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>创建您的帐户资料</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>创建Ring帐户</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
+        <translation>设置您的用户名:</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
-        <source>Next</source>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>注册公共用户名(试验性)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>密码</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>确认密码</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>正在生成您的Ring帐户…</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>上一步</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation>下一步</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file