i18n: automatic bump
Change-Id: I782bb4a24397f317a99ebf8258a71598c81e6c0e
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts
index 95ea46b..acfd3ae 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -15,7 +15,7 @@
<message utf8="true">
<location filename="../aboutdialog.ui" line="541"/>
<source>Liberté, Égalité, Fraternité - Version 1.0</source>
- <translation type="unfinished"/>
+ <translation>自由、平等、博爱 - 版本 1.0</translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="557"/>
@@ -494,7 +494,7 @@
<message>
<location filename="../callwidget.ui" line="888"/>
<source>Double-click to copy</source>
- <translation type="unfinished"/>
+ <translation>双击复制</translation>
</message>
<message>
<location filename="../callwidget.ui" line="923"/>
@@ -502,144 +502,144 @@
<translation>创建二维码时产生错误</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1190"/>
+ <location filename="../callwidget.ui" line="1193"/>
<source>Add to contacts</source>
<translation>加入通讯录</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1219"/>
+ <location filename="../callwidget.ui" line="1222"/>
<source>Start the conversation !</source>
<translation>开始会话！</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1296"/>
+ <location filename="../callwidget.ui" line="1299"/>
<source>Type your message here</source>
- <translation type="unfinished"/>
+ <translation>在此输入您的消息</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1315"/>
+ <location filename="../callwidget.ui" line="1318"/>
<source>send message</source>
<translation>发送消息</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1441"/>
+ <location filename="../callwidget.ui" line="1444"/>
<source>BestId</source>
- <translation type="unfinished"/>
+ <translation>BestId</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1451"/>
+ <location filename="../callwidget.ui" line="1454"/>
<source>Wants to talk to you!</source>
<translation>想要与您通信！</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1546"/>
+ <location filename="../callwidget.ui" line="1549"/>
<source>Answer</source>
<translation>应答</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1578"/>
+ <location filename="../callwidget.ui" line="1581"/>
<source>Ignore</source>
<translation>忽略</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1649"/>
+ <location filename="../callwidget.ui" line="1652"/>
<source>Calling</source>
<translation>正在通话</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1722"/>
+ <location filename="../callwidget.ui" line="1725"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1431"/>
+ <location filename="../callwidget.ui" line="1434"/>
<source>Call</source>
<translation>通话</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="279"/>
+ <location filename="../callwidget.cpp" line="278"/>
<source>Copy number</source>
<translation>复制号码</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="290"/>
+ <location filename="../callwidget.cpp" line="289"/>
<source>Add to contact</source>
<translation>加入通讯录</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="919"/>
+ <location filename="../callwidget.cpp" line="928"/>
<source>Contact me on Ring</source>
<translation>在Ring上联系我</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="919"/>
+ <location filename="../callwidget.cpp" line="928"/>
<source>My RingId is : </source>
<translation>我的RingID是：</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="212"/>
+ <location filename="../callwidget.cpp" line="211"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="222"/>
+ <location filename="../callwidget.cpp" line="221"/>
<source>Display date</source>
<translation>显示日期</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="226"/>
+ <location filename="../callwidget.cpp" line="225"/>
<source>Display author</source>
<translation>显示作者</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="255"/>
+ <location filename="../callwidget.cpp" line="254"/>
<source>Message incoming from %1</source>
<translation>消息来自%1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="284"/>
+ <location filename="../callwidget.cpp" line="283"/>
<source>Copy name</source>
<translation>复制名称</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="300"/>
+ <location filename="../callwidget.cpp" line="299"/>
<source>Call Number</source>
<translation>通话号码</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="301"/>
+ <location filename="../callwidget.cpp" line="300"/>
<source>Copy Number</source>
<translation>复制号码</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="304"/>
+ <location filename="../callwidget.cpp" line="303"/>
<source>Copy %1</source>
<translation>复制%1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="309"/>
+ <location filename="../callwidget.cpp" line="308"/>
<source>Call %1</source>
<translation>呼叫%1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="731"/>
+ <location filename="../callwidget.cpp" line="730"/>
<source>NO RING ACCOUNT FOUND</source>
<translation>未找到Ring帐户</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="763"/>
+ <location filename="../callwidget.cpp" line="765"/>
<source>%1</source>
<comment>%1 is the contact username</comment>
<translation>%1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="765"/>
+ <location filename="../callwidget.cpp" line="770"/>
<source>%1</source>
<comment>%1 is the contact unique identifier</comment>
<translation>%1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="414"/>
+ <location filename="../callwidget.cpp" line="413"/>
<source>Call incoming from %1</source>
<translation>来电：%1</translation>
</message>
@@ -865,12 +865,12 @@
<message>
<location filename="../contactrequestwidget.ui" line="87"/>
<source>nameLabel</source>
- <translation type="unfinished"/>
+ <translation>nameLabel</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="103"/>
<source>bestIdLabel</source>
- <translation type="unfinished"/>
+ <translation>bestIdLabel</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="129"/>
@@ -1043,6 +1043,44 @@
</message>
</context>
<context>
+ <name>PhotoboothWidget</name>
+ <message>
+ <location filename="../photoboothwidget.ui" line="14"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../photoboothwidget.ui" line="48"/>
+ <source>Take photo</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../photoboothwidget.ui" line="68"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../photoboothwidget.ui" line="81"/>
+ <source>Import photo</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../photoboothwidget.ui" line="84"/>
+ <source>Import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../photoboothwidget.cpp" line="66"/>
+ <source>Choose File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../photoboothwidget.cpp" line="68"/>
+ <source>Files (*)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QObject</name>
<message>
<location filename="../utils.cpp" line="185"/>
@@ -1079,7 +1117,7 @@
<message>
<location filename="../sendcontactrequestwidget.ui" line="39"/>
<source>TODO: Explain the purpose of a contact request</source>
- <translation type="unfinished"/>
+ <translation>TODO: Explain the purpose of a contact request</translation>
</message>
<message>
<location filename="../sendcontactrequestwidget.ui" line="78"/>
@@ -1130,22 +1168,22 @@
<translation>加入通话</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="490"/>
+ <location filename="../videooverlay.ui" line="473"/>
<source>Name label</source>
<translation>名称标签</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="512"/>
+ <location filename="../videooverlay.ui" line="495"/>
<source>Add to contact</source>
<translation>加入通讯录</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="582"/>
+ <location filename="../videooverlay.ui" line="565"/>
<source>Time elapsed</source>
<translation>用时</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="585"/>
+ <location filename="../videooverlay.ui" line="568"/>
<source>00:00</source>
<translation>00:00</translation>
</message>
@@ -1163,17 +1201,17 @@
<context>
<name>VideoView</name>
<message>
- <location filename="../videoview.cpp" line="236"/>
+ <location filename="../videoview.cpp" line="235"/>
<source>Share entire screen</source>
<translation>共享整个屏幕</translation>
</message>
<message>
- <location filename="../videoview.cpp" line="239"/>
+ <location filename="../videoview.cpp" line="238"/>
<source>Share screen area</source>
<translation>共享屏幕区域</translation>
</message>
<message>
- <location filename="../videoview.cpp" line="246"/>
+ <location filename="../videoview.cpp" line="245"/>
<source>Share file</source>
<translation>共享文件</translation>
</message>
@@ -1186,17 +1224,17 @@
<translation>您的Ring帐户需要迁移。输入您的密码。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="105"/>
+ <location filename="../wizarddialog.cpp" line="107"/>
<source>Migrating your Ring account...</source>
<translation>正在迁移您的Ring帐户…</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="125"/>
+ <location filename="../wizarddialog.cpp" line="127"/>
<source>Unknown</source>
<translation>未知</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="159"/>
+ <location filename="../wizarddialog.cpp" line="161"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>正在注册您的公共用户名，可能需要几分钟…</translation>
</message>
@@ -1206,22 +1244,22 @@
<translation>添加设备</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="323"/>
+ <location filename="../wizarddialog.cpp" line="325"/>
<source>Username not available.</source>
<translation>用户名不可用。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="326"/>
+ <location filename="../wizarddialog.cpp" line="328"/>
<source>Username is available.</source>
<translation>用户名可用。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="329"/>
+ <location filename="../wizarddialog.cpp" line="331"/>
<source>Username is invalid.</source>
<translation>用户名非法。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="332"/>
+ <location filename="../wizarddialog.cpp" line="334"/>
<source>Network error.</source>
<translation>网络错误。</translation>
</message>
@@ -1243,7 +1281,7 @@
<message>
<location filename="../wizarddialog.ui" line="69"/>
<source> Welcome to</source>
- <translation type="unfinished"/>
+ <translation>欢迎来到</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="179"/>
@@ -1257,7 +1295,16 @@
<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li>
<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></source>
- <translation type="unfinished"/>
+ <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">为了连接该设备到另一个账户，您首先 </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">需要获取一个 PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;">。 以下是获取 PIN 的步骤:</span></p>
+<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">前往您之前使用的设备的 <span style=" font-weight:600;">帐户管理设置</span> </li>
+<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">选择您想使用的 <span style=" font-weight:600;">Ring 帐户</span> </li>
+<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">前往 <span style=" font-weight:600;">设备</span> 选项卡</li>
+<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">选择 <span style=" font-weight:600;">添加设备</span></li></ol>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">这样您就会获得一个用来完成添加帐户的 PIN，该 PIN 在 </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 分钟</span><span style=" font-family:'Ubuntu'; font-size:12pt;">内有效。</span></p></body></html></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="207"/>
@@ -1265,71 +1312,71 @@
<translation>创建您的帐户资料</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="292"/>
+ <location filename="../wizarddialog.ui" line="312"/>
<source>Enter your full name:</source>
<translation>输入您的全名：</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="348"/>
- <location filename="../wizarddialog.cpp" line="223"/>
+ <location filename="../wizarddialog.ui" line="368"/>
+ <location filename="../wizarddialog.cpp" line="224"/>
<source>Create your account</source>
<translation>创建Ring帐户</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="373"/>
+ <location filename="../wizarddialog.ui" line="393"/>
<source>Choose your username:</source>
<translation>设置您的用户名：</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="421"/>
+ <location filename="../wizarddialog.ui" line="441"/>
<source>Choose your username</source>
<translation>设置您的用户名</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="437"/>
- <location filename="../wizarddialog.cpp" line="295"/>
+ <location filename="../wizarddialog.ui" line="457"/>
+ <location filename="../wizarddialog.cpp" line="297"/>
<source>Searching...</source>
<translation>正在搜索…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="446"/>
+ <location filename="../wizarddialog.ui" line="466"/>
<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>在Ring上注册您的用户名。该用户名将由您独占。您的联系人将能够使用该用户名联系您，不必使用您的RingID。</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="449"/>
+ <location filename="../wizarddialog.ui" line="469"/>
<source>Register public username (experimental)</source>
<translation>注册公共用户名（试验性）</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="476"/>
+ <location filename="../wizarddialog.ui" line="496"/>
<source>Enter your pin</source>
<translation>输入您的PIN</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="506"/>
+ <location filename="../wizarddialog.ui" line="526"/>
<source>Password</source>
<translation>密码</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
+ <location filename="../wizarddialog.ui" line="556"/>
<source>Confirm password</source>
<translation>确认密码</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="604"/>
- <location filename="../wizarddialog.cpp" line="107"/>
+ <location filename="../wizarddialog.ui" line="624"/>
+ <location filename="../wizarddialog.cpp" line="109"/>
<source>Generating your Ring account...</source>
<translation>正在生成您的Ring帐户…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="640"/>
+ <location filename="../wizarddialog.ui" line="660"/>
<source>Previous</source>
<translation>上一步</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="672"/>
- <location filename="../wizarddialog.ui" line="675"/>
+ <location filename="../wizarddialog.ui" line="692"/>
+ <location filename="../wizarddialog.ui" line="695"/>
<source>Next</source>
<translation>下一步</translation>
</message>