i18n: automatic bump
Change-Id: I5ce22de2417369ab1ec1799b0cc56fee3e542d30
diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts
index 29454d6..1e9d1c4 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh" version="2.0">
<context>
<name>AboutDialog</name>
<message>
@@ -13,38 +13,33 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.ui" line="554"/>
- <source>Release : Louis-Joseph Papineau</source>
- <translation>釋出：Louis-Joseph Papineau</translation>
+ <location filename="../aboutdialog.ui" line="541"/>
+ <source>Release : Beta 2 - Gaston Miron</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"/>
</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>版本</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="40"/>
+ <location filename="../aboutdialog.cpp" line="37"/>
<source>Created by:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="52"/>
+ <location filename="../aboutdialog.cpp" line="67"/>
<source>Artwork by:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="56"/>
+ <location filename="../aboutdialog.cpp" line="71"/>
<source>Based on the SFLPhone project</source>
<translation type="unfinished"/>
</message>
@@ -52,330 +47,400 @@
<context>
<name>AccountDetails</name>
<message>
- <location filename="../accountdetails.ui" line="20"/>
+ <location filename="../accountdetails.ui" line="23"/>
<source>Settings</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="60"/>
+ <location filename="../accountdetails.ui" line="63"/>
<source>General</source>
<translation>通用</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="175"/>
+ <location filename="../accountdetails.ui" line="137"/>
<source>Account</source>
<translation>帳號</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="238"/>
+ <location filename="../accountdetails.ui" line="197"/>
<source>Type</source>
<translation>型</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="204"/>
+ <location filename="../accountdetails.ui" line="163"/>
<source>Alias</source>
<translation>別名</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="308"/>
+ <location filename="../accountdetails.ui" line="241"/>
<source>Parameters</source>
<translation>參數</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="341"/>
+ <location filename="../accountdetails.ui" line="271"/>
<source>Hostname</source>
<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>使用者名</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>密码</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="127"/>
- <source>delete account</source>
- <translation>刪除帳號</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="424"/>
+ <location filename="../accountdetails.ui" line="488"/>
<source>Proxy</source>
<translation>代理</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="464"/>
+ <location filename="../accountdetails.ui" line="528"/>
<source>Voicemail number</source>
<translation>語音留言號</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="498"/>
+ <location filename="../accountdetails.ui" line="562"/>
<source>Auto-answer calls</source>
<translation>來電自動應答</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="516"/>
+ <location filename="../accountdetails.ui" line="580"/>
<source>UPnP enabled</source>
<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>允許未知來電</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="726"/>
+ <location filename="../accountdetails.ui" line="665"/>
<source>Allow Call From Contact</source>
<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="674"/>
+ <location filename="../accountdetails.ui" line="311"/>
+ <source>Public username</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="611"/>
<source>Ring Account Settings</source>
<translation>Ring 帳號設定</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="772"/>
+ <location filename="../accountdetails.ui" line="701"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</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>播放</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="854"/>
+ <location filename="../accountdetails.ui" line="785"/>
<source>Audio/Video</source>
<translation>音訊/視訊</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1070"/>
+ <location filename="../accountdetails.ui" line="1001"/>
<source>Audio codecs</source>
<translation>音訊編碼器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1100"/>
+ <location filename="../accountdetails.ui" line="1031"/>
<source>Video codecs</source>
<translation>視訊編碼器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1117"/>
+ <location filename="../accountdetails.ui" line="1048"/>
<source>Advanced</source>
<translation>進階</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1163"/>
+ <location filename="../accountdetails.ui" line="1094"/>
<source>Registration</source>
<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"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1221"/>
+ <location filename="../accountdetails.ui" line="1152"/>
<source>Network Interface</source>
<translation>網路介面</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1242"/>
+ <location filename="../accountdetails.ui" line="1173"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1277"/>
<source>Same as local parameters</source>
<translation>與本地參數相同</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1367"/>
+ <location filename="../accountdetails.ui" line="1298"/>
<source>Set published address and port:</source>
<translation>設定公開地址與連結埠：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1393"/>
+ <location filename="../accountdetails.ui" line="1324"/>
<source>Address</source>
<translation>地址</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1424"/>
+ <location filename="../accountdetails.ui" line="1355"/>
<source>Port</source>
<translation>埠</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1478"/>
+ <location filename="../accountdetails.ui" line="1409"/>
<source>Use STUN</source>
<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"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1519"/>
+ <location filename="../accountdetails.ui" line="1450"/>
<source>Use TURN</source>
<translation>使用</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1586"/>
+ <location filename="../accountdetails.ui" line="1517"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1635"/>
+ <location filename="../accountdetails.ui" line="1566"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</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"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1705"/>
+ <location filename="../accountdetails.ui" line="1636"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</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>最小值</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>最大值</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1839"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1965"/>
+ <location filename="../accountdetails.ui" line="1896"/>
<source>Security</source>
<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="2355"/>
+ <location filename="../accountdetails.ui" line="2180"/>
+ <source>Devices</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2224"/>
+ <source>Add device</source>
+ <translation type="unfinished"/>
+ </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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2267"/>
+ <source>Password (required)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2373"/>
+ <source>Your generated pin:</source>
+ <translation type="unfinished"/>
+ </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 type="unfinished"/>
+ </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>加密媒體串流(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>公開發佈地址</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>CA 認證</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2161"/>
+ <location filename="../accountdetails.ui" line="1998"/>
<source>User certificate</source>
<translation>使用者認證</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2195"/>
+ <location filename="../accountdetails.ui" line="2032"/>
<source>Private key</source>
<translation>私鑰</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2210"/>
+ <location filename="../accountdetails.ui" line="2047"/>
<source>Private key password</source>
<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>使用預設加密方式</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="54"/>
+ <location filename="../accountdetails.cpp" line="55"/>
<source>Pause</source>
<translation>暫停</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="242"/>
+ <location filename="../accountdetails.cpp" line="101"/>
+ <source>RingID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.cpp" line="229"/>
<source>Choose File</source>
<translation>選擇檔案</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="244"/>
+ <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="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 type="unfinished"/>
+ </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>或是輸入號碼...</translation>
@@ -389,181 +454,182 @@
<context>
<name>CallWidget</name>
<message>
- <location filename="../callwidget.ui" line="20"/>
- <source>Form</source>
- <translation>從</translation>
- </message>
- <message>
- <location filename="../callwidget.ui" line="197"/>
+ <location filename="../callwidget.ui" line="213"/>
<source>Search contacts or enter ring ID</source>
<translation>從通訊錄尋找或是輸入ring ID</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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../callwidget.ui" line="545"/>
<source>settings menu</source>
<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>
+ <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 type="unfinished"/>
</message>
<message>
- <location filename="../callwidget.ui" line="670"/>
+ <location filename="../callwidget.ui" line="659"/>
<source><html><head/><body><p align="center"><span style=" font-size:10pt; color:#aeaeae;">This is your RingID.</span></p><p align="center"><span style=" font-size:10pt; color:#aeaeae;">Copy and share it with your friends!</span></p></body></html></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../callwidget.ui" line="774"/>
+ <location filename="../callwidget.ui" line="763"/>
<source>Share your ring id</source>
<translation>分享你的ring ID</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="829"/>
+ <location filename="../callwidget.ui" line="866"/>
<source><html><head/><body><p align="center"><span style=" color:#aeaeae;">Double-click to copy.</span></p></body></html></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../callwidget.ui" line="842"/>
+ <location filename="../callwidget.ui" line="895"/>
<source>Error while generating QR Code</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../callwidget.ui" line="944"/>
+ <location filename="../callwidget.ui" line="1067"/>
+ <source>contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../callwidget.ui" line="1094"/>
<source>Conversation with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../callwidget.ui" line="1027"/>
+ <location filename="../callwidget.ui" line="1177"/>
<source>Start the conversation !</source>
<translation type="unfinished"/>
</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="1240"/>
+ <location filename="../callwidget.ui" line="1390"/>
+ <source>BestId</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../callwidget.ui" line="1400"/>
<source>Wants to talk to you!</source>
<translation>想要與你談天！</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1335"/>
+ <location filename="../callwidget.ui" line="1495"/>
<source>Answer</source>
<translation>接通</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1367"/>
+ <location filename="../callwidget.ui" line="1527"/>
<source>Ignore</source>
<translation>忽略</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1438"/>
+ <location filename="../callwidget.ui" line="1598"/>
<source>Calling</source>
<translation>撥打</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1492"/>
+ <location filename="../callwidget.ui" line="1671"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1230"/>
+ <location filename="../callwidget.ui" line="1380"/>
<source>Call</source>
<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>複製號碼</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>加入通訊錄</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="210"/>
- <source>Share by email</source>
- <translation>透過email分享</translation>
- </message>
- <message>
- <location filename="../callwidget.cpp" line="212"/>
+ <location filename="../callwidget.cpp" line="926"/>
<source>Contact me on Ring</source>
<translation>透過Ring聯絡我</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="212"/>
+ <location filename="../callwidget.cpp" line="926"/>
<source>My RingId is : </source>
<translation>我的Ring ID是：</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="215"/>
- <source>Show QRCode</source>
- <translation>顯示QRCode</translation>
- </message>
- <message>
- <location filename="../callwidget.cpp" line="229"/>
+ <location filename="../callwidget.cpp" line="212"/>
<source>Copy</source>
<translation>複製</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="239"/>
+ <location filename="../callwidget.cpp" line="222"/>
<source>Display date</source>
<translation>顯示日期</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="243"/>
+ <location filename="../callwidget.cpp" line="226"/>
<source>Display author</source>
<translation>顯示作者</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="271"/>
+ <location filename="../callwidget.cpp" line="255"/>
<source>Message incoming from %1</source>
<translation> </translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="310"/>
+ <location filename="../callwidget.cpp" line="284"/>
+ <source>Copy name</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../callwidget.cpp" line="300"/>
<source>Call Number</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../callwidget.cpp" line="311"/>
+ <location filename="../callwidget.cpp" line="301"/>
<source>Copy Number</source>
<translation>複製號碼</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="314"/>
+ <location filename="../callwidget.cpp" line="304"/>
<source>Copy %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../callwidget.cpp" line="319"/>
+ <location filename="../callwidget.cpp" line="309"/>
<source>Call %1</source>
<translation type="unfinished"/>
</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>找不到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"/>
</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"/>
@@ -617,6 +683,11 @@
<translation type="unfinished"/>
</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>影像</translation>
@@ -647,62 +718,62 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="681"/>
+ <location filename="../configurationwidget.ui" line="652"/>
+ <source>Enable notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../configurationwidget.ui" line="699"/>
<source>Check for update automatically every</source>
<translation>自動檢查更新每</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="709"/>
+ <location filename="../configurationwidget.ui" line="736"/>
<source>days</source>
<translation>天</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="736"/>
- <source>Check for updates</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"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="903"/>
+ <location filename="../configurationwidget.ui" line="942"/>
<source>Device Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="961"/>
+ <location filename="../configurationwidget.ui" line="1000"/>
<source>Device</source>
<translation>裝置</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="992"/>
+ <location filename="../configurationwidget.ui" line="1031"/>
<source>Resolution</source>
<translation>解析度</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1029"/>
+ <location filename="../configurationwidget.ui" line="1068"/>
<source>Output Device</source>
<translation>輸出裝置</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1044"/>
+ <location filename="../configurationwidget.ui" line="1083"/>
<source>Input Device</source>
<translation>輸入裝置</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1141"/>
+ <location filename="../configurationwidget.ui" line="1180"/>
<source>add new account</source>
<translation>加入新的帳號</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1168"/>
+ <location filename="../configurationwidget.ui" line="1242"/>
<source>Import</source>
<translation>載入</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1175"/>
+ <location filename="../configurationwidget.ui" line="1249"/>
<source>Export</source>
<translation>輸出</translation>
</message>
@@ -712,17 +783,17 @@
<translation>帳號</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="661"/>
+ <location filename="../configurationwidget.ui" line="676"/>
<source>Launch Ring on Startup</source>
<translation>啟動時執行</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="303"/>
+ <location filename="../configurationwidget.cpp" line="310"/>
<source>New Account</source>
<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"/>
</message>
@@ -738,14 +809,6 @@
</message>
</context>
<context>
- <name>ContactDelegate</name>
- <message>
- <location filename="../contactdelegate.cpp" line="87"/>
- <source><Multiple contact methods></source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>ContactPicker</name>
<message>
<location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
</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 type="unfinished"/>
+ </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 type="unfinished"/>
+ </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'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"/>
@@ -809,17 +951,17 @@
<translation>Ring</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="57"/>
+ <location filename="../mainwindow.cpp" line="53"/>
<source>Configuration</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="60"/>
+ <location filename="../mainwindow.cpp" line="56"/>
<source>Exit</source>
<translation>離開</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="84"/>
+ <location filename="../mainwindow.cpp" line="80"/>
<source>About</source>
<translation>關於</translation>
</message>
@@ -898,30 +1040,41 @@
<source>No default mail client found</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="35"/>
+ <source>Ring account</source>
+ <comment>Default alias for new Ring account</comment>
+ <translation type="unfinished"/>
+ </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"/>
</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="../ringbutton.ui" line="69"/>
- <source>TextLabel</source>
+ <location filename="../sendcontactrequestwidget.ui" line="26"/>
+ <source>ContactID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <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>
@@ -968,22 +1121,22 @@
<translation>加入通話</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="473"/>
+ <location filename="../videooverlay.ui" line="490"/>
<source>Name label</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../videooverlay.ui" line="495"/>
+ <location filename="../videooverlay.ui" line="512"/>
<source>Add to contact</source>
<translation>加入通訊錄 </translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="565"/>
+ <location filename="../videooverlay.ui" line="582"/>
<source>Time elapsed</source>
<translation>經過時間</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="568"/>
+ <location filename="../videooverlay.ui" line="585"/>
<source>00:00</source>
<translation>00:00</translation>
</message>
@@ -1001,17 +1154,17 @@
<context>
<name>VideoView</name>
<message>
- <location filename="../videoview.cpp" line="232"/>
+ <location filename="../videoview.cpp" line="235"/>
<source>Share entire screen</source>
<translation>分享整個螢幕</translation>
</message>
<message>
- <location filename="../videoview.cpp" line="235"/>
+ <location filename="../videoview.cpp" line="238"/>
<source>Share screen area</source>
<translation>分享部分螢幕</translation>
</message>
<message>
- <location filename="../videoview.cpp" line="242"/>
+ <location filename="../videoview.cpp" line="245"/>
<source>Share file</source>
<translation>分享檔案</translation>
</message>
@@ -1019,23 +1172,150 @@
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="58"/>
- <source>Please wait while we create your account.</source>
- <translation>請等待片刻，我們將為你創建新的帳戶</translation>
+ <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.ui" line="124"/>
+ <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.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 type="unfinished"/>
+ </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><!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:'Ubuntu'; 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-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p>
+<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li>
+<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li>
+<li style=" 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-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-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="159"/>
+ <source>Create your profile</source>
+ <translation type="unfinished"/>
+ </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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>Choose your username:</source>
<translation>選擇你的使用者名稱:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="195"/>
- <location filename="../wizarddialog.ui" line="198"/>
+ <location filename="../wizarddialog.ui" line="370"/>
+ <source>Choose your username</source>
+ <translation>選擇你的使用者名稱</translation>
+ </message>
+ <message>
+ <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 type="unfinished"/>
+ </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 type="unfinished"/>
+ </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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="621"/>
+ <location filename="../wizarddialog.ui" line="624"/>
<source>Next</source>
<translation>下一步</translation>
</message>