From 7089cb8566f9a65c25ff29dc4e9fb3ffb3b25ecd Mon Sep 17 00:00:00 2001
From: Jenkins <jenkins@ring-packaging.cx>
Date: Mon, 9 Oct 2017 03:40:46 -0400
Subject: [PATCH] i18n: automatic bump
Change-Id: I21d682ec7b78253e4cff40fab049b607a0c4e974
---
translations/ring_client_windows.ts | 511 ++++----
translations/ring_client_windows_ar.ts | 519 +++++----
translations/ring_client_windows_bg.ts | 519 +++++----
translations/ring_client_windows_ca.ts | 515 ++++----
translations/ring_client_windows_cs_CZ.ts | 519 +++++----
translations/ring_client_windows_da_DK.ts | 525 +++++----
translations/ring_client_windows_de.ts | 513 ++++----
translations/ring_client_windows_de_DE.ts | 520 +++++----
translations/ring_client_windows_el.ts | 519 +++++----
translations/ring_client_windows_en_GB.ts | 511 ++++----
translations/ring_client_windows_eo.ts | 519 +++++----
translations/ring_client_windows_es.ts | 519 +++++----
translations/ring_client_windows_et_EE.ts | 1289 +++++++++++----------
translations/ring_client_windows_fa_IR.ts | 519 +++++----
translations/ring_client_windows_fi.ts | 519 +++++----
translations/ring_client_windows_fr.ts | 521 +++++----
translations/ring_client_windows_fr_CA.ts | 519 +++++----
translations/ring_client_windows_fr_FR.ts | 517 +++++----
translations/ring_client_windows_he.ts | 519 +++++----
translations/ring_client_windows_hi_IN.ts | 511 ++++----
translations/ring_client_windows_hr.ts | 519 +++++----
translations/ring_client_windows_hu.ts | 519 +++++----
translations/ring_client_windows_id.ts | 513 ++++----
translations/ring_client_windows_it.ts | 519 +++++----
translations/ring_client_windows_it_IT.ts | 519 +++++----
translations/ring_client_windows_ja.ts | 519 +++++----
translations/ring_client_windows_ko_KR.ts | 513 ++++----
translations/ring_client_windows_lt.ts | 523 +++++----
translations/ring_client_windows_ms.ts | 519 +++++----
translations/ring_client_windows_nb.ts | 867 +++++++-------
translations/ring_client_windows_nl.ts | 519 +++++----
translations/ring_client_windows_nl_NL.ts | 513 ++++----
translations/ring_client_windows_pa.ts | 511 ++++----
translations/ring_client_windows_pl.ts | 519 +++++----
translations/ring_client_windows_pl_PL.ts | 1289 +++++++++++----------
translations/ring_client_windows_pt.ts | 515 ++++----
translations/ring_client_windows_pt_BR.ts | 559 +++++----
translations/ring_client_windows_ro.ts | 515 ++++----
translations/ring_client_windows_ru.ts | 519 +++++----
translations/ring_client_windows_ru_RU.ts | 519 +++++----
translations/ring_client_windows_sk_SK.ts | 519 +++++----
translations/ring_client_windows_sl.ts | 513 ++++----
translations/ring_client_windows_sq_AL.ts | 519 +++++----
translations/ring_client_windows_sv.ts | 519 +++++----
translations/ring_client_windows_tr.ts | 519 +++++----
translations/ring_client_windows_uk.ts | 513 ++++----
translations/ring_client_windows_zh.ts | 519 +++++----
translations/ring_client_windows_zh_CN.ts | 519 +++++----
translations/ring_client_windows_zh_TW.ts | 793 +++++++------
49 files changed, 15430 insertions(+), 12134 deletions(-)
diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index 0252dc9..2bb6e85 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -90,14 +90,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
@@ -122,17 +122,17 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"></translation>
</message>
@@ -173,12 +173,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"></translation>
</message>
@@ -223,448 +223,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"></translation>
</message>
@@ -1211,22 +1277,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"></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>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"></translation>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"></translation>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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"></translation>
</message>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts
index 8687518..79de3af 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -89,14 +89,14 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>اسم المستخدم</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>كلمة السر</translation>
</message>
@@ -121,17 +121,17 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
<translation>تفعيل UPnP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>إسمح لأشخاص مجهولة بالإتصال</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>إسمح للأشخاص في قائمة الإتصالات المعروفة بالإتصال</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>إسمح للأشخاص في تاريخ المكالمات بالإتصال</translation>
</message>
@@ -172,12 +172,12 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>إعدادات الحساب Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>تشغيل</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>صوت/فيديو</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>مرمّزات الصوت</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>مرمّزات الفيديو</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>إعدادات متقدمة</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>التسجيل</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>إنقضاء فترة التسجيل (ثواني):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>واجهة الشبكة</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>نقطة عبور ( port ) محلية</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>مثل المعلمات المحلية</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>وضع العنوان و نقطة العبور المنشورة</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>العنوان</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>نقطة عبور ( port )</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>إستعمل STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>عنوان خادم التطبيق</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>إستعمل TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>حقل ( realm )</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>جلسة تفاوض SDP (حل تعويض ICE)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>هذه الإعدادات مستعملة فقط أثناء جلسات التفاوض SDP في حالة ما ICE ليس مؤيد من طرف خادم التطبيق أو الشخص المكالم.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>نطاق المنفذ RTP الصوتي</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>الحد الأدنى</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>الحد الاقصى</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>نطاق المنفذ RTP فيديو</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>تأمين</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>ألغِ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>موافق</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>العنوان المنشور</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>شهادة CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>شهادة المستخدم</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>المفتاح الخاص</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>كلمة سر المفتاح الخاص</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>إستعمل قائمة الشيفرة المبدئية</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>إيقاف مؤقت</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>إختار ملف</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>وثائق (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -992,7 +1058,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>صوت/فيديو</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>حسابات</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>استيراد</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>تصدير</translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation>إطلق Ring عند بدء التشغيل</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>حساب جديد</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>هل أنت متأكد من حذف تاريخك ؟</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation>عن RING</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>المسار</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>كلمة السر</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>موافق</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>ألغي</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <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"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>فتح ملف</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1778,7 +1790,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>ترتيب</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>مجهول</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>اختر اسم مستخدمك</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>كلمة السر</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>إحداث حسابك Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>التالي</translation>
</message>
diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts
index 41eb0d0..c8510ee 100644
--- a/translations/ring_client_windows_bg.ts
+++ b/translations/ring_client_windows_bg.ts
@@ -89,14 +89,14 @@ Ring е сигурен и разпределен софтуер за общув
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Потребителско име</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Парола</translation>
</message>
@@ -121,17 +121,17 @@ Ring е сигурен и разпределен софтуер за общув
<translation>UPnP е активиран</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Позволяване на обажданията от непознати</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Позволяване на обажданията от контакти</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Позволяване на обажданията от хора в историята</translation>
</message>
@@ -172,12 +172,12 @@ Ring е сигурен и разпределен софтуер за общув
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring е сигурен и разпределен софтуер за общув
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Настройки на акаунта за Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Избор на тон за звънене</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Пускане</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Звук/видео</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Аудио кодеци</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Видео кодеци</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Разширени</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Регистрация</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Годност на регистрацията (секунди):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Мрежова карта</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Местен порт:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Използване на местните параметри</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Задаване на публикувания адрес и порт:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Адрес</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Порт</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Използване на STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Адрес на сървъра</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Използване на TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Област</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Минимум</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Максимум</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Сигурност</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Устройства</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Добавяне на устройство</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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. Това ще Ви даде ПИН-код, който трябва да бъде въведен на новото устройство в рамките на 5 минути от създаването си.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Парола (задължително)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Отказ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Създаденият за Вас Личен Разпознавателен Код</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>Личен Разпознавателен Код</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>Добре</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Блокирани контакти</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Публикуван адрес</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Сертификат от център за сертифициране</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Потребителски сертификат</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Частен ключ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Парола за частен ключ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Използване на шифри по подразбиране</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Изберете файл</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Всички файлове (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Грешна парола.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -992,7 +1058,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Звук/видео</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Акаунти</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Внасяне</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Изнасяне</translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation>Пускане на Ring със системата</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Нов акаунт</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Наистина ли искате да изчистите цялата история?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Избиране на папка</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Възникна грешка при внасянето на акаунта.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation>Относно</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Път</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Парола</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Добре</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Отказ</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Запазване на файла</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Файлове с архиви на Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Отваряне на файл</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation>Не е открит клиент за е-поща по подразбиране</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Акаунт</translation>
@@ -1778,7 +1790,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Настройка</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Неизвестно</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation>Свързване на това устройство с акаунт</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Създаване на профил</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Изберете потребителско име</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Регистриране на публично име (експериментално)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Парола</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Потвърдете паролата</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Създаване на Вашия акаунт в Ring…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Предишен</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Напред</translation>
</message>
diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts
index 45b2489..1a66d9b 100644
--- a/translations/ring_client_windows_ca.ts
+++ b/translations/ring_client_windows_ca.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Nom d'usuari</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Contrasenya</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP habitlitat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Reproduir</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avançat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registre</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Temps d'expiració del registre (segons):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Interfície de xarxa</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Igual que els paràmetres locals</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Establir port i adreça públics:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adreça</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Utilitza STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Utilitza TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Rang de ports de l'àudio RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Mín</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Màx</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Seguretat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Dispositius</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Afegir dispositiu</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Cancel·la</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>D'acord</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Adreça publicada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Certificat CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Certificat d'usuari</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Clau privada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Contrasenya de la clau privada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Utilitza xifrats per defecte</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Contrasenya incorrecta.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -1001,7 +1067,7 @@ Copieu i compartiu amb les vostres amistats!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Comptes</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copieu i compartiu amb les vostres amistats!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importa</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Exporta</translation>
</message>
@@ -1235,25 +1291,20 @@ Copieu i compartiu amb les vostres amistats!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Compte Nou</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Copieu i compartiu amb les vostres amistats!</translation>
<translation>Quant a</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Contrasenya</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Cancel·la</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Copieu i compartiu amb les vostres amistats!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Compte de Ring</translation>
@@ -1811,50 +1823,65 @@ Copieu i compartiu amb les vostres amistats!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Desconegut</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Copieu i compartiu amb les vostres amistats!</translation>
<translation>Enllaça aquest dispositiu a un compte</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Copieu i compartiu amb les vostres amistats!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Crei el seu perfil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Contrasenya</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Generant el vostre compte de Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Següent</translation>
</message>
diff --git a/translations/ring_client_windows_cs_CZ.ts b/translations/ring_client_windows_cs_CZ.ts
index 8ba7a32..3645126 100644
--- a/translations/ring_client_windows_cs_CZ.ts
+++ b/translations/ring_client_windows_cs_CZ.ts
@@ -89,14 +89,14 @@ Ring je bezpečný a distribuovaný komunikační program.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Uživatelské jméno</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Heslo</translation>
</message>
@@ -121,17 +121,17 @@ Ring je bezpečný a distribuovaný komunikační program.</translation>
<translation>UPnP povoleno</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Povolit hovory od neznámých</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Povolit hovory od kontaktů</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Povolit hovory z Historie</translation>
</message>
@@ -172,12 +172,12 @@ Ring je bezpečný a distribuovaný komunikační program.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Zaregistrovat uživatelské jméno na blockchainu</translation>
</message>
@@ -222,448 +222,514 @@ Ring je bezpečný a distribuovaný komunikační program.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Nastavení účtu Ringu</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Výběr vyzváněcí melodie</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Přehrát</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Zvuk/Obraz</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Zvukové kodeky</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Obrazové kodeky</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Pokročilé</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registrace</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Vypršení registrace (v sekundách):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Síťové rozhraní</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Místní port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Stejné jako místní parametry</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Zadat veřejnou adresu a port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adresa</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Použít STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL serveru</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Použít TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Oblast</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Vyjednávání sezení SDP (ICE Fallback)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Tato nastavení jsou použita jen během vyjednávání sezení SDP, v případě že ICE není podporováno serverem nebo peerem.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Rozsah portů pro zvuk RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Max</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Rozsah portů pro obraz RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Zabezpečení</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Šifrování datového toku (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Zařízení</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Přidat zařízení</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Abyste si ke svému účtu Ring přidali nové zařízení, exportujte si účet na Ring. Tím získáte PIN, který musíte do 5 minut od jeho vytvoření zadat na svém novém zařízení.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Heslo (vyžadováno)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Zrušit</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Exportovat na Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Váš vygenerovaný PIN:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Zakázané kontakty</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Zveřejněná adresa</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA certifikát</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Uživatelský certifikát</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Soukromý klíč</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Heslo soukromého klíče</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Použít výchozí šifry</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pozastavit</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Vyberte soubor</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Soubory (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Počkejte prosím, zatímco bude váš PIN vytvářen.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Chyba v síti. Zkuste to, prosím, později znovu.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Špatné heslo</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Registruje se... Může to chvíli trvat</translation>
</message>
@@ -992,7 +1058,7 @@ Kopírujte a sdílejte jej s přáteli!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Zvuk/Obraz</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Kopírujte a sdílejte jej s přáteli!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Účty</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Kopírujte a sdílejte jej s přáteli!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importovat</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Exportovat</translation>
</message>
@@ -1236,25 +1292,20 @@ Kopírujte a sdílejte jej s přáteli!</translation>
<translation>Spouštět Ring po spuštění systému</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nový účet</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Opravdu chcete vymazat všechnu svou historii?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Vyberte adresář</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Chyba při zavádění účtu.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Kopírujte a sdílejte jej s přáteli!</translation>
<translation>O aplikaci</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Cesta</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Heslo</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>OK</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Zrušit</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Uložit soubor</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Archivní soubory Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Otevřít soubor</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Kopírujte a sdílejte jej s přáteli!</translation>
<translation>Nenalezen žádný výchozí e-mailový klient</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Účet Ring</translation>
@@ -1778,7 +1790,7 @@ Kopírujte a sdílejte jej s přáteli!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Nastavení</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Kopírujte a sdílejte jej s přáteli!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Přesunuje se váš účet Ring…</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Neznámý</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Registruje se vaše veřejné uživatelské jméno. Může to trvat několik minut...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Přidat zařízení</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Uživatelské jméno není dostupné.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Uživatelské jméno je dostupné.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Uživatelské jméno je neplatné.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Chyba sítě.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Kopírujte a sdílejte jej s přáteli!</translation>
<translation>Připojit toto zařízení k účtu</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Jak přidat zařízení</translation>
</message>
@@ -1877,7 +1904,7 @@ Kopírujte a sdílejte jej s přáteli!</translation>
<translation>Vítejte v</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Vytvořit vlastní profil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Vytvořit vlastní účet</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Zvolte si uživatelské jméno</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Hledá se...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Zaregistrovat jméno veřejně (experimentální)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Zadejte PIN</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Heslo</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Potvrdit heslo</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Vytváří se váš účet Ring…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Předchozí</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Další</translation>
</message>
diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts
index 4d50075..0265ddb 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -10,12 +10,12 @@
<message>
<location filename="../aboutdialog.ui" line="462"/>
<source>about button</source>
- <translation type="unfinished"/>
+ <translation>Knap til om</translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="478"/>
<source>credits button</source>
- <translation type="unfinished"/>
+ <translation>Knap til krediteringer</translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="481"/>
@@ -89,14 +89,14 @@ Ring er software til sikker og distribueret kommunikation.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Brugernavn</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Adgangskode</translation>
</message>
@@ -121,17 +121,17 @@ Ring er software til sikker og distribueret kommunikation.</translation>
<translation>UPnP aktiveret</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Tillad opkald fra ukendt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Tillad opkald fra kontakt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Tillad opkald fra historik</translation>
</message>
@@ -172,12 +172,12 @@ Ring er software til sikker og distribueret kommunikation.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Registrer på blockchain</translation>
</message>
@@ -222,448 +222,514 @@ Ring er software til sikker og distribueret kommunikation.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Indstillinger for Ring-konto</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Valg af ringetone</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Afspil</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Lyd/video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Audio-codec'er</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Video-codec'er</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avanceret</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registrering</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Tidsgrænse for registrering (sekunder):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Netværksinterface</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Lokal port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Samme som lokale parametre</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Sæt offentliggjorte adresse og port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Brug STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Server-URL</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Brug TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Realm</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP Sessions-forhandling (ICE-tilbagefald)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Disse indstillinger bruges kun under SDP-sessiinsforhandling hvis ICE ikke understøttes af serveren eller modparten.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Område for lyd RTP-port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Maks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Område for video RTP-port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Sikkerhed</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Mediestrøm kryptering (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Enheder</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Tilføj enhed</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>For at tilføje en ny enhed til din Ring-konto skal den eksporteres til Ring. Dette vil generere en PIN-kode som skal indtastes på den nye enhed indenfor 5 minutter,</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Adgangskode (påkrævet)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Annuller</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Eksporter til Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Din genererede PIN-kode:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>Denne PIN skal indtastes på den nye enhed inden for 5 minutter. Du kan til enhver tid generere en ny.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Blokerede kontakter</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Publiceret Adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA-certifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Brugercertifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Privat nøgle</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Adgangskode til privat nøgle</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Brug standardcifre</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Vælg fil</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Filer (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Vent venligst mens din PIN genereres.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Netværksfejl. Prøv igen senere.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Forkert adgangskode.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Registrerer... Dette kan tage lidt tid</translation>
</message>
@@ -992,7 +1058,7 @@ Kopiér og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Lyd/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Kopiér og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Konti</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Kopiér og del den med dine venner!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importér</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Eksport</translation>
</message>
@@ -1236,25 +1292,20 @@ Kopiér og del den med dine venner!</translation>
<translation>Start Ring ved opstart</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Ny konto</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Er du sikker på, at du vil slette al din historik?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Vælg folder</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>En fejl opstod ved import af konto</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Kopiér og del den med dine venner!</translation>
<translation>Om</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Sti</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Adgangskode</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Ok</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Annuller</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Gem fil</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring arkiv filer (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Åbn fil</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Kopiér og del den med dine venner!</translation>
<translation>Ingen standard mail-klient fundet</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring-konto</translation>
@@ -1778,7 +1790,7 @@ Kopiér og del den med dine venner!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Konfiguration</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Kopiér og del den med dine venner!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>Din konto kræver migrering. Indtast din adgangskode.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Migrerer din Ring-konto....</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Ukendt</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Registrerer dit offentlige brugernavn, dette kan tage et par minutter...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Tilføj enhed</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Brugernavn er ikke tilgængeligt.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Brugernavn tilgængeligt.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Brugernavn ikke gyldigt.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Netværksfejl.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,9 +1894,9 @@ Kopiér og del den med dine venner!</translation>
<translation>Tilknyt denne enhed til en konto</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
- <translation>Hvordan man tilføjer en enhed</translation>
+ <translation>Sådan tilføjes en enhed</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="78"/>
@@ -1877,7 +1904,7 @@ Kopiér og del den med dine venner!</translation>
<translation>Velkommen til</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1900,34 +1927,34 @@ p, li { white-space: pre-wrap; }
<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;">Du vil nu få PIN-koden som skal indtastes her. Den er kun gyldig i </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutter</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Opret din profil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Skriv dit fulde navn:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Opret din konto</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Vælg dit brugernavn</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Søger...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>Registrer dit brugernavn i Ring. Dette vil reservere brugernavnet så kun du kan anvende det. Dine venner vil være i stand til at ringe til dig ved brug af dette brugernavn, i stedet for dit RingID.</translation>
</message>
@@ -1972,134 +1999,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Registrer offentligt brugernavn (eksperimentel funktionalitet)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Indtast din PIN</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Adgangskode</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Bekræft adgangskode</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Genererer din Ring-konto...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Tilbage</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Næste</translation>
</message>
diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index e8433dc..9e2ffa0 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -89,14 +89,14 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Benutzername</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Passwort</translation>
</message>
@@ -121,17 +121,17 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
<translation>UPnP aktiviert</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Anruf von Unbekannt erlauben</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Anruf von Kontakt erlauben</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Anruf von Verlauf erlauben</translation>
</message>
@@ -172,12 +172,12 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Den Benutzernamen auf der Blockchain registrieren.</translation>
</message>
@@ -222,448 +222,514 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ring-Kontoeinstellungen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Klingelton wählen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Abspielen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Audio Codecs</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Video Codecs</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Erweitert</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registrierung</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Registrierungsverfallzeitüberschreitung (Sekunden):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Netzwerkschnittstelle</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Lokaler Port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Identisch zu den lokalen Parametern</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Veröffentlichte Adresse und Port setzen:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>STUN benutzen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Server URL</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Turn benutzen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Bereich</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP Sitzungsverhandlung (ICE Fallback)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Diese Einstellungen werden nur benutzt für eine SDP-Sitzungsverhandlung im Falle, dass ICE vom Server oder vom Teilnehmer nicht unterstützt wird.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Audio RTP Portbereich</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Max</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Video RTP Portbereich</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Sicherheit</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Media Stream Encryption (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Geräte</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Gerät hinzufügen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Um einen neues Gerät mit Ihrem Ring-Konto zu verknüpfen, mussen Sie Ihr Konto exportieren. Dabei wird ein PIN-Nummer generiert, der bei Ihrem neuen Gerät innerhalb von 5 Minuten eingegeben werden muss.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Passwort (erforderlich)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Zu Ring exportieren</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Ihre generierte PIN:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>Bitte gib Deine PIN auf dem neuen Gerät innerhalb von 5 minuten ein. Du kannst jederzeit eine neue PIN generieren.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Gesperrte Kontakte</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Veröffentlichte Adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA-Zertifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Benutzerzertifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Privater Schlüssel</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Passwort für den privaten Schlüssel</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Standardcipher verwenden</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>Ring-ID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Datei auswählen</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Dateien (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Bitte warte, während wir deine neue PIN generieren.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Netzwerkfehler, bitte später nochmal versuchen.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Falsches Passwort.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Registriere... Kann eine Weile dauern</translation>
</message>
@@ -1211,22 +1277,12 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Import</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Export</translation>
</message>
@@ -1236,25 +1292,20 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation>
<translation>Ring beim Hochfahren starten</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Neues Konto</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Sind sie sicher das sie den gesamten Verlauf leeren möchten?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Verzeichnis wählen</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Ein Fehler ist während des Imports des Benutzerkontos aufgetreten</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation>
<translation>Über</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Pfad</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Passwort</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Ok</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Abbrechen</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Datei speichern</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring Archiv-Dateien (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Datei öffnen</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation>
<translation>Kein Standardprogramm für E‑Mail gefunden</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring-Konto</translation>
@@ -1812,50 +1824,65 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>Ihr Ring-Konto muss migriert werden. Bitte geben Sie Ihr Passwort ein.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Ihr RIng-Konto wird migriert...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Unbekannt</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Dein öffentlicher Benutzername wird registriert, das kann ein paar Minuten dauern...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Gerät hinzufügen</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Benutzername nicht verfügbar.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Benutzername verfügbar.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Benutzername ist ungültig.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Netzwerkfehler</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation>
<translation>Dieses Gerät mit einem Konto verknüpfen</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Wie kann ich ein neues Gerät hinzufügen</translation>
</message>
@@ -1877,7 +1904,7 @@ Kopieren und teilen Sie sie mit ihren Freunden!</translation>
<translation>Willkommen bei</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation>1</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Erstellen Sie Ihr Profil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Geben Sie Ihren vollständigen Namen ein</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Legen Sie ein Benutzerkonto an</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Nutzername wählen</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Suchen...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>Registriere deinen Benutzernamen bei Ring. Dadurch wird der Benutzername reserviert, sodass nur du ihn benutzen kannst. Deine Freunde werden die Möglichkeit haben dich mit Hilfe deines Benutzernamens anzurufen anstatt dafür deine RingID zu benutzen.</translation>
</message>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Melden Sie sich für einen allgemein-bekannten Benutzername an (experimentell)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Geben Sie Ihre PIN ein</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Passwort</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Passwort bestätigen</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Ihr Ring-Konto wird generiert...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Vorherige</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Weiter</translation>
</message>
diff --git a/translations/ring_client_windows_de_DE.ts b/translations/ring_client_windows_de_DE.ts
index e37efcd..98f72d5 100644
--- a/translations/ring_client_windows_de_DE.ts
+++ b/translations/ring_client_windows_de_DE.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Benutzername</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>
Passwort</translation>
@@ -121,17 +121,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP aktiviert</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -172,12 +172,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Wiedergeben</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Erweitert</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Netzwerkschnittstelle</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>TURN benutzen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Max</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Sicherheit</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>Okay</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Privater Schlüssel</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Falsches Passwort.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -991,7 +1057,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1001,7 +1067,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Kontos</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Exportieren</translation>
</message>
@@ -1235,25 +1291,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,46 +1587,6 @@ Copy and share it with your friends!</source>
<translation>Über</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>
- Passwort</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Abbrechen</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1646,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring-Konto</translation>
@@ -1778,7 +1789,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Konfiguration</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1823,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Unbekannt</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1893,7 @@ Copy and share it with your friends!</source>
<translation>Dieses Gerät mit einem Ring-Konto verknüpfen</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1877,7 +1903,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Passwort</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Konto bestätigen</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Weiter</translation>
</message>
diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts
index 23285de..2a44fc5 100644
--- a/translations/ring_client_windows_el.ts
+++ b/translations/ring_client_windows_el.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Όνομα χρήστη</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Σύνθημα</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP ενεργοποίηση</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Αναπαραγωγή</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Ήχος/Βίντεο</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Για προχωρημένους</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Εγγραφή</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Χρονική λήξη καταχώρησης (δευτερόλεπτα):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Διεπαφή δικτύου</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Τα ίδια ως τοπικοί παράμετροι</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Καθορισμός δημοσιευμένης διεύθυνσης και θύρας:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Διεύθυνση</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Χρήση STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Χρήση TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Διαπραγμάτευση συνεδρίας SDP (εφεδρικό του ICE)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Αυτές οι ρυθμίσεις χρησιμοποιούνται μόνο κατά την διαπραγμάτευση της συνεδρία SDP, σε περίπτωση που το ICE δεν υποστηρίζεται από τον διακομιστή ή τον κόμβο.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Εύρος θυρών RTP ήχου</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Ελάχιστο</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Μέγιστο</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Εύρος θυρών RTP βίντεο</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Ασφάλεια</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Συσκευές</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Προσθήκη συσκευής</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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 λεπτά από την δημιουργία του.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Ακύρωση</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Εξαγωγή στο Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Το δημιουργημένο σας PIN:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Δημοσιευμένη διεύθυνση</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Πιστοποιητικό CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Πιστοποιητικό χρήστη</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Ιδιωτικό κλειδί</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Συνθηματικό ιδιωτικού κλειδιού</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Χρήση προκαθορισμένων αλγόριθμων κρυπτογράφησης</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -991,7 +1057,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Ήχος/Βίντεο</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1001,7 +1067,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Λογαριασμοί</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Εισαγωγή</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Εξαγωγή</translation>
</message>
@@ -1235,25 +1291,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Νέος λογαριασμός</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Copy and share it with your friends!</source>
<translation>Περί</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Σύνθημα</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Εντάξει</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Ακύρωση</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <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"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Άνοιγμα αρχείου</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1777,7 +1789,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Ρυθμίσεις</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1811,50 +1823,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Άγνωστος</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Copy and share it with your friends!</source>
<translation>Σύνδεση αυτής της συσκευής με ένα λογαριασμό</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Συνθηματικό</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Γίνεται δημιουργία του λογαριασμού σας Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Προηγούμενο</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Επόμενο</translation>
</message>
diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts
index 3c86986..8b124e9 100644
--- a/translations/ring_client_windows_en_GB.ts
+++ b/translations/ring_client_windows_en_GB.ts
@@ -90,14 +90,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
@@ -122,17 +122,17 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"></translation>
</message>
@@ -173,12 +173,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"></translation>
</message>
@@ -223,448 +223,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Play</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"></translation>
</message>
@@ -1211,22 +1277,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"></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>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"></translation>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"></translation>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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"></translation>
</message>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts
index 6c50030..2f1324b 100644
--- a/translations/ring_client_windows_eo.ts
+++ b/translations/ring_client_windows_eo.ts
@@ -89,14 +89,14 @@ Ring estas sekura kaj disa komunikprogramo.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Uzantnomo</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Pasvorto</translation>
</message>
@@ -121,17 +121,17 @@ Ring estas sekura kaj disa komunikprogramo.</translation>
<translation>UPnP ŝaltita</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Permesi Vokojn de Nekonataj</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Permesi Vokojn de Kontaktoj</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Permesi Vokojn de Historio</translation>
</message>
@@ -172,12 +172,12 @@ Ring estas sekura kaj disa komunikprogramo.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring estas sekura kaj disa komunikprogramo.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Agordoj de Ring Konto</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Elekto de vokosono</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Ludi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Aŭdio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Sonkodekoj</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Videokodekoj</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Speciala</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registriĝo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Tempolimo de registriĝo (sekunde):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Reta Interfaco</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Loka Pordo:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Same kiel lokaj parametroj</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Agordi publikan adreson kaj pordon:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adreso</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Pordo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Uzi STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL de servilo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Uzi TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Regno</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Intertraktado de SDP seanco (ICE retropaŝo)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Tiuj ĉi agordoj estas uzataj nur dum intertraktado de SDP seanco, se ICE ne estas subtenata de la servilo aŭ samtavolano.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Porda Amplekso de Aŭdia RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Maks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Porda Amplekso de Videa RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Sekurigo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Aŭdvidflua ĉifrado</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Aparatoj</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Aldoni aparaton</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Por aldoni novan aparaton al via Ring konto, vi elportu vian konton sur Ring. Vi akiros PIN kodon, kiun vi devos enigi en vian novan aparaton dum 5 minutoj.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Rezigni</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Elporti sur Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Via generita PIN:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>Okej</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Publikita Adreso</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA atestilo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Uzanta atestilo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Privata ŝlosilo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Pasvorto de privata ŝlosilo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Uzi defaŭltajn ĉifrojn</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Paŭzo</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Elektu dosieron</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Dosieroj (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -992,7 +1058,7 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Aŭdio/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Kontoj</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Enporti</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Elporti</translation>
</message>
@@ -1236,25 +1292,20 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
<translation>Lanĉi Ring Post Startigo</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nova Konto</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Ĉu vi certe volas vakigi vian tutan historion?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Elektu dosierujon</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Eraro okazis dum enportado de konto.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
<translation>Pri</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Dosierindiko</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Pasvorto</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Okej</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Rezigni</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Konservi Dosieron</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Arkivaj dosieroj de Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Malfermi Dosieron</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
<translation>Neniu defaŭlta retpoŝta kliento trovita</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1778,7 +1790,7 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Agordo</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Nekonata</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1877,7 +1904,7 @@ Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Elektu vian uzantnomon</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Pasvorto</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Konfirmu pasvorton</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Generanta vian Ring-an konton...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Antaŭa</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Sekva</translation>
</message>
diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts
index 934baab..5b10692 100644
--- a/translations/ring_client_windows_es.ts
+++ b/translations/ring_client_windows_es.ts
@@ -89,14 +89,14 @@ Ring es un programa de comunicación distribuido y seguro.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Nombre de usuario</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Contraseña</translation>
</message>
@@ -121,17 +121,17 @@ Ring es un programa de comunicación distribuido y seguro.</translation>
<translation>UPnP habilitado</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Permitir llamadas desconocidas</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Permitir llamadas de Contactos</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Permitir llamada desde el Historial</translation>
</message>
@@ -172,12 +172,12 @@ Ring es un programa de comunicación distribuido y seguro.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Registrarse en blockchain</translation>
</message>
@@ -222,448 +222,514 @@ Ring es un programa de comunicación distribuido y seguro.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Configuración de la cuenta Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Selección de tono de llamada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Reproducir</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Códecs de audio</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Códecs de video </translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registro</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Tiempo de espera de Registración (seg):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Interface de Red</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Puerto Local:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Igual que los parametros locales</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Configurar dirección publicada y puerto:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Dirección</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Puerto</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Utilizar STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL del Servidor</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Utilizar TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Dominio</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Negociación de sesión SDP (Retorna a ICE)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Estas configuraciones solo se usan durante una negociación de una sesión SDP en caso de que ICE no sea soportado por el servidor o el compañero</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Rango de Puertos RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Mínimo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Máximo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Rango de Puertos RTP de Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Seguridad</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Cifrado del flujo audiovisual (SRPT)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Dispositivos</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Agregar dispositivo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Para agregar un dispositivo a tu cuenta se exportará la misma en Ring. Esto producirá un PIN que debes escribir en el nuevo dispositivo antes de que pasen 5 minutos.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Contraseña (obligatoria)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Exportar en Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>PIN generado:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>El pin se debe introducir en su nuevo dispositivo en 5 minutos. Puede generar uno nuevo en cualquier momento.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Contactos bloqueados</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Dirección IP Publicada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Certificado CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Certificado de usuario</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Clave privada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Contraseña de clave privada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Usar cifrados por defecto</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pausar</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Examinar</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Ficheros (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Espere mientras se genera su PIN.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Error de red. Por favor, inténtelo de nuevo más tarde.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Contraseña errónea</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Registrando... Puede tardar un poco de tiempo</translation>
</message>
@@ -992,7 +1058,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Cuentas</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importar</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Exportar</translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation>Iniciar Ring automáticamente</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nueva cuenta</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>¿Estás seguro de que quieres limpiar todo el historial?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Elige directorio</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Hubo un error al importar la cuenta</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation>Acerca de</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Ruta</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Contraseña</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Aceptar</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Guardar fichero</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Archivos de Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Abrir fichero</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation>No se encuentra el cliente de e-mail predeterminado</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Cuenta de Ring</translation>
@@ -1778,7 +1790,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Configuración</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Migrando su cuenta de Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Desconocido</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Registrando su nombre de usuario, puede tardar unos minutos...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Añadir un dispositivo</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Nombre de usuario no disponible.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Nombre de usuario disponible.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Nombre de usuario incorrecto.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Error de red.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation>Conectar este dispositivo a una cuenta</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Cómo agregar un dispositivo</translation>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation>Bienvenido(a) a</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1900,34 +1927,34 @@ p, li { white-space: pre-wrap; }
<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;">Necesitará el PIN para completar el formulario. El PIN es válido por </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutos</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Crea tu perfil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Introduzca su nombre completo:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Crea tu cuenta</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Elije un nombre de usuario para ti</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Buscando...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>Registre su nombre de usuario en Ring. Esto reservará el nombre de usuario para que solo tú puedas usarlo. Sus amigos podrán llamarle con su nombre de usuario en lugar de usar su RingID.</translation>
</message>
@@ -1972,134 +1999,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Registrar un nombre público (experimental)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Escribe tu PIN</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Contraseña</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Confirmar contraseña</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Generando tu cuenta Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Anterior</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Siguiente</translation>
</message>
diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts
index 973af1d..2815109 100644
--- a/translations/ring_client_windows_et_EE.ts
+++ b/translations/ring_client_windows_et_EE.ts
@@ -1,57 +1,59 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="et_EE">
<context>
<name>AboutDialog</name>
<message>
<location filename="../aboutdialog.ui" line="435"/>
<location filename="../aboutdialog.ui" line="465"/>
<source>About</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="462"/>
<source>about button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="478"/>
<source>credits button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="481"/>
<source>Credits</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message utf8="true">
<location filename="../aboutdialog.ui" line="547"/>
<source>Liberté, Égalité, Fraternité - Version 1.0</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="563"/>
<source>The Microsoft Windows client for Ring.
Ring is a secured and distributed communication software.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="30"/>
<source>version</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="37"/>
<source>Created by:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="71"/>
<source>Artwork by:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="75"/>
<source>Based on the SFLPhone project</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -59,612 +61,678 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../accountdetails.ui" line="23"/>
<source>Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="66"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="143"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="206"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="250"/>
<source>Parameters</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="280"/>
<source>Hostname</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="515"/>
<source>Proxy</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="558"/>
<source>Voicemail number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="598"/>
<source>Auto-answer calls</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="619"/>
<source>UPnP enabled</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="69"/>
<source>General account info configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="169"/>
<source>Displayed name</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="191"/>
<source>Displayed alias input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="302"/>
<source>Hostname URL for DHT bootstrap or SIP</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="323"/>
<source>Public username</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="350"/>
<source>Ring public registered username</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="369"/>
<source>Register username on blockchain button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="389"/>
<source>Name service URL</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="411"/>
<source>Nameservice URL input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="448"/>
<source>SIP username input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="491"/>
<source>SIP password input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="537"/>
<source>SIP proxy URL input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="580"/>
<source>SIP voicemail number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="592"/>
<source>Autoanswer call checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="613"/>
<source>UPnP enabled checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Mängi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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 type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -672,27 +740,27 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../bannedcontactswidget.ui" line="20"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="41"/>
<source>Banned contacts list</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="69"/>
<source>Banned ID</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="101"/>
<source>Deban contact button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="104"/>
<source>Deban contact, and add to contact list</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -700,27 +768,27 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../callutilsdialog.ui" line="53"/>
<source>existing contacts list</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="68"/>
<source>contact transfer number text entry</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="71"/>
<source>or type number...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="110"/>
<source>Transfer call button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="113"/>
<source>Transfer</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -728,116 +796,116 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../callwidget.ui" line="216"/>
<source>Search contacts or enter ring ID</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="333"/>
<source>Conversations</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="384"/>
<source>Contact requests</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="642"/>
<source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="207"/>
<source>Search contact text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="248"/>
<source>search button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="557"/>
<source>Configuration menu</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="680"/>
<source>This is your RingID.
Copy and share it with your friends!</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="791"/>
<source>Show ring ID QR code</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="842"/>
<source>Share ring ID button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="900"/>
<source>Double-click to copy</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="935"/>
<source>Error while generating QR Code</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="979"/>
<location filename="../callwidget.ui" line="1069"/>
<location filename="../callwidget.ui" line="1840"/>
<source>Back to homepage button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1189"/>
<source>Peer contact method selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1208"/>
<location filename="../callwidget.cpp" line="327"/>
<source>Add to contacts</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1237"/>
<source>Start the conversation !</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1314"/>
<source>Type your message here</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1333"/>
<source>send message</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1459"/>
<source>BestId</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1469"/>
<source>Wants to talk to you!</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1498"/>
<source>Answer incoming call button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1543"/>
<source>Ignore incoming call button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1570"/>
@@ -847,7 +915,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../callwidget.ui" line="1602"/>
<source>Ignore</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1673"/>
@@ -857,104 +925,104 @@ Copy and share it with your friends!</source>
<message>
<location filename="../callwidget.ui" line="1726"/>
<source>Cancel outgoing call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1749"/>
<source>Cancel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1449"/>
<source>Call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="295"/>
<source>Copy number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="959"/>
<source>Contact me on Ring</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="959"/>
<source>My RingId is : </source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="214"/>
<source>Copy</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="227"/>
<source>Display date</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="232"/>
<source>Display author</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="263"/>
<source>Message incoming from %1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="301"/>
<source>Copy name</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="307"/>
<source>Call Number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="308"/>
<source>Copy Number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="311"/>
<source>Copy %1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="316"/>
<source>Call %1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="338"/>
<source>Remove from contacts</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="762"/>
<source>NO RING ACCOUNT FOUND</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="807"/>
<source>%1</source>
<comment>%1 is the contact username</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="812"/>
<source>%1</source>
<comment>%1 is the contact unique identifier</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="445"/>
<source>Call incoming from %1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -962,7 +1030,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../combar.ui" line="72"/>
<source>Call button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -970,92 +1038,92 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="20"/>
<source>Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="97"/>
<source>General configuration tab</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="103"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="119"/>
<source>Audio / Video configuration tab</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
<source>Accounts configuration tab</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
<source>quit settings menu</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="346"/>
<source>History Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="387"/>
<source>Keep History for (days)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="433"/>
<source>(Set to 0 for unlimited history)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="490"/>
<source>Clear History</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="642"/>
<source>Misc. Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="667"/>
<source>Keep minimized on close</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="820"/>
<source>Check for updates now</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="258"/>
<source>Profile</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="288"/>
<source>Avatar (click to change)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="311"/>
<source>Display name text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="314"/>
@@ -1065,193 +1133,178 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="400"/>
<source>Number of days of history kept</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="484"/>
<source>clear history button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="527"/>
<source>Record Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="560"/>
<source>Save in :</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="573"/>
<source>Call records path</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="603"/>
<source>Always record calls checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="609"/>
<source>Always Record</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="661"/>
<source>keep minimized on close checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="679"/>
<source>enable notifications checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="685"/>
<source>Enable notifications</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="703"/>
<source>Launch ring on startup checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="732"/>
<source>Autamatic update checks checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="738"/>
<source>Check for update automatically every</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="757"/>
<source>Interval between update checks in days selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="778"/>
<source>days</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="817"/>
<source>Check for updates now button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="933"/>
<source>Preview unavailable during call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="987"/>
<source>Device Selection</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1042"/>
<location filename="../configurationwidget.ui" line="1061"/>
<source>Video device selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1048"/>
<source>Device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1082"/>
<source>Resolution</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1095"/>
<source>Video device resolution selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1122"/>
<source>Output Device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1129"/>
<source>Audio output device selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1141"/>
<source>Input Device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1148"/>
<source>Audio input device selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1226"/>
<source>New account type selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1245"/>
<source>add new account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1283"/>
<source>Delete account button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="712"/>
<source>Launch Ring on Startup</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1259,57 +1312,57 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactpicker.ui" line="33"/>
<source>Existing Contact</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="43"/>
<source>search existing contact text entry</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="46"/>
<source>Search...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="56"/>
<source>existing contacts list</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="63"/>
<source>Create new contact button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="66"/>
<source>Create new contact</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="85"/>
<source>New Contact</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="108"/>
<source>New contact name text entry</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="111"/>
<source>Enter a name here...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="141"/>
<source>Validate contact creation button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="144"/>
<source>Create</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1317,52 +1370,52 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactrequestwidget.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="28"/>
<source>Incoming Contact Request</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="87"/>
<source>nameLabel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="103"/>
<source>bestIdLabel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="125"/>
<source>Accept contact request button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="132"/>
<source>Accept</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="151"/>
<source>Mute contact request</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="158"/>
<source>Discard</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="177"/>
<source>Ban contact request</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="184"/>
<source>Block</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1370,22 +1423,22 @@ Copy and share it with your friends!</source>
<message>
<location filename="../currentaccountwidget.ui" line="26"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../currentaccountwidget.ui" line="97"/>
<source>Account avatar</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../currentaccountwidget.ui" line="128"/>
<source>Account status</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../currentaccountwidget.ui" line="141"/>
<source>account selection combobox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1393,42 +1446,42 @@ Copy and share it with your friends!</source>
<message>
<location filename="../deleteaccountdialog.ui" line="14"/>
<source>Ring - account deletion</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="33"/>
<source>Do you really want to delete account ?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="66"/>
<source>This action is irrevocable</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</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"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="138"/>
<source>Cancel contact deletion button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="141"/>
<source>Cancel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="167"/>
<source>Validate contact deletion button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="170"/>
<source>Ok</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1436,42 +1489,42 @@ Copy and share it with your friends!</source>
<message>
<location filename="../deletecontactdialog.ui" line="20"/>
<source>Dialog</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="47"/>
<source>Do you want to delete this contact?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="123"/>
<source>Cancel contact deletion button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="126"/>
<source>Cancel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="139"/>
<source>Delete contact validation button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="142"/>
<source>Delete</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="155"/>
<source>Delete and ban validation button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="158"/>
<source>Delete and ban</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1479,37 +1532,37 @@ Copy and share it with your friends!</source>
<message>
<location filename="../instantmessagingwidget.ui" line="38"/>
<source>Message list</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.ui" line="74"/>
<source>Message input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.ui" line="77"/>
<source>Send text message...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.ui" line="99"/>
<source>Send message button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.cpp" line="44"/>
<source>Copy</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.cpp" line="50"/>
<source>Display date</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.cpp" line="54"/>
<source>Display author</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1517,61 +1570,22 @@ Copy and share it with your friends!</source>
<message>
<location filename="../mainwindow.ui" line="435"/>
<source>Ring</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="59"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="62"/>
<source>Exit</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="81"/>
<source>About</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1579,7 +1593,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../photoboothdialog.ui" line="14"/>
<source>Photobooth</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1587,42 +1601,42 @@ Copy and share it with your friends!</source>
<message>
<location filename="../photoboothwidget.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="20"/>
<source>Photobooth display</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="51"/>
<source>Take photo</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="71"/>
<source>or</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="84"/>
<source>Import photo</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="87"/>
<source>Import</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.cpp" line="66"/>
<source>Choose File</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.cpp" line="68"/>
<source>Files (*)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1630,13 +1644,13 @@ Copy and share it with your friends!</source>
<message>
<location filename="../utils.cpp" line="187"/>
<source>No default mail client found</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1644,17 +1658,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../qualitydialog.ui" line="64"/>
<source>Quality slider</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qualitydialog.ui" line="103"/>
<source>Automatic quality checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qualitydialog.ui" line="106"/>
<source>Auto</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1662,17 +1676,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="114"/>
<source>Validate Contact Request Button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="139"/>
<source>Mute contact request button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="161"/>
<source>Ban contact request button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1680,7 +1694,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../ringbutton.ui" line="140"/>
<source>Select folder</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1688,22 +1702,22 @@ Copy and share it with your friends!</source>
<message>
<location filename="../sendcontactrequestwidget.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sendcontactrequestwidget.ui" line="26"/>
<source>ContactID</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sendcontactrequestwidget.ui" line="39"/>
<source>TODO: Explain the purpose of a contact request</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sendcontactrequestwidget.ui" line="78"/>
<source>Send contact request</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1711,82 +1725,82 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="42"/>
<source>Call on Hold</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="119"/>
<source>Hold / Unhold</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="154"/>
<source>Chat</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="186"/>
<source>Add person to call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="218"/>
<source>Transfer call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="256"/>
<source>Mute Mic</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="338"/>
<source>Record call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="370"/>
<source>Quality</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="402"/>
<source>Join Calls</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="476"/>
<source>Name label</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="498"/>
<source>Add to contact</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="568"/>
<source>Time elapsed</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="571"/>
<source>00:00</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
<source>Hangup</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="297"/>
<source>Mute Video</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1794,303 +1808,358 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videoview.cpp" line="235"/>
<source>Share entire screen</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videoview.cpp" line="238"/>
<source>Share screen area</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videoview.cpp" line="245"/>
<source>Share file</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation type="unfinished"/>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="173"/>
<source>Link this device to an account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="78"/>
<source> Welcome to</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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:'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;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; 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-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;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</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;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</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;">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>
+</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;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; 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-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;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</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;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</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;">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 type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="33"/>
<source>Wizard Dialog</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="36"/>
<source>Account creation wizard dialog</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="72"/>
<source>Welcome Label</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="107"/>
<source>Welcome Logo</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="139"/>
<source>Create Ring account button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="145"/>
<source>Push button for Ring account creation start trigger</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="164"/>
<source>Link device button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="170"/>
<source>Push button for device linkage start trigger</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/translations/ring_client_windows_fa_IR.ts b/translations/ring_client_windows_fa_IR.ts
index 5123820..90f0077 100644
--- a/translations/ring_client_windows_fa_IR.ts
+++ b/translations/ring_client_windows_fa_IR.ts
@@ -89,14 +89,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>نام کاربری</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>گذرواژه</translation>
</message>
@@ -121,17 +121,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP فعال شد</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>اجازه به مخاطبان برای تماس</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -172,12 +172,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>تنظیمات حساب رینگ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>ش</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>صدا/تصویر</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>پیشرفته</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>ثبت نام</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>رابط شبکه</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>درگاه محلی</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>همانند پارامترهای محلی</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>نشانی</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>درگاه</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>از STUN استفاده کن</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>آدرس سرور</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>استفاده از TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>دامنهٔ درگاه RTP صدا</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>کمینه</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>بیشینه</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>امنیت</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>افزارهها</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>افزودن دستگاه</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>لغو</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>خب</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>نشانی منتشر شده</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>گواهی CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>گواهی کاربر</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>کلید خصوصی</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>گذرواژه کلید خصوصی</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>آیدی رینگ</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>انتخاب فایل</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>فایلها (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>کلمه عبور اشتباه است.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -992,7 +1058,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>صدا/تصویر</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>حسابها</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>برونریزی</translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>حساب جدید</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation>درباره</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>گذرواژه</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>خب</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>لغو</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>حساب رینگ</translation>
@@ -1778,7 +1790,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>پکربندی</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>ناشناخته</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation>پیوند این افزاره به یک حساب</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>نمایه خود را بسازید</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>حساب کاربری خود را بسازید</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>ثبت نام کاربری عمومی (آزمایشی)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>گذرواژه</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>تأیید گذرواژه</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>پیشین</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>بعدی</translation>
</message>
diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts
index 12503ff..7e8ad45 100644
--- a/translations/ring_client_windows_fi.ts
+++ b/translations/ring_client_windows_fi.ts
@@ -89,14 +89,14 @@ Ring on turvallinen ja hajautettu keskustelusovellus.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Käyttäjänimi</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Salasana</translation>
</message>
@@ -121,17 +121,17 @@ Ring on turvallinen ja hajautettu keskustelusovellus.</translation>
<translation>UPnP päällä</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Salli puhelut tuntemattomilta</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Salli puhelut yhteystiedolta</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Salli puhelu historiasta</translation>
</message>
@@ -172,12 +172,12 @@ Ring on turvallinen ja hajautettu keskustelusovellus.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring on turvallinen ja hajautettu keskustelusovellus.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ring tunnuksen asetukset</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Soittoäänen valinta</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Toista</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Ääni/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Äänikoodekit</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Videokoodekit</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Edistyneet asetukset</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Rekistöröinti</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Rekistöröinnin aikakatkaisu (sekunneissa):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Verkkoliitäntä</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Paikallinen portti:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Sama kuin paikalliset parametrit</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Osoite</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Portti</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Käytä STUNia</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Palvelimen osoite</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>RTP porttiväli</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Minimi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Maksimi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Video RTP porttiväli</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Turvallisuus</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Mediavirran salaus (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Peru</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA sertifikaatti</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Käyttäjäsertifikaatti</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Henkilökohtainen salausavain</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Henkilökohtaisen salausavaimen salasana</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Tauota</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Valitse tiedosto</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Tiedostot (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -991,7 +1057,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Ääni/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1001,7 +1067,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Tunnukset</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Tuo</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Vie</translation>
</message>
@@ -1235,25 +1291,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Uusi tunnus</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Oletko varma että haluat tyhjentää koko historiasi?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Valitse hakemisto</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Virhe tunnuksen tuonnissa</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Copy and share it with your friends!</source>
<translation>Tietoa</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Polku</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Salasana</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Vahvista</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Peru</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Tallenna tiedosto</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring pakatut tiedostot (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Avaa tiedosto</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Copy and share it with your friends!</source>
<translation>Ei oletusarvoista sähköpostiohjelmaa</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1777,7 +1789,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Määrittelyt</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1811,50 +1823,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Tuntematon</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Valitse käyttäjänimesi</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Salasana</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Varmista salasana</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Seuraava</translation>
</message>
diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts
index 4952b54..a92e047 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -89,14 +89,14 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Nom d'utilisateur</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Mot de passe</translation>
</message>
@@ -121,17 +121,17 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
<translation>UPnP activé</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Autoriser les appels de personnes inconnues</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Autoriser les appels de vos contacts</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Autoriser les appels enregistrés dans l'historique</translation>
</message>
@@ -143,7 +143,7 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
<message>
<location filename="../accountdetails.ui" line="169"/>
<source>Displayed name</source>
- <translation type="unfinished"/>
+ <translation>nom affiché</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="191"/>
@@ -172,12 +172,12 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Enregistrer sur la blockchain</translation>
</message>
@@ -222,448 +222,514 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Paramètres Compte Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Choix de sonneries</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Lire</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Vidéo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Codecs audio</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Codecs vidéo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Options avancées</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Enregistrement</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Temps d'expiration de l'enregistrement (en secondes) :</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Interface réseau</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Port local :</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Identique aux paramètres locaux</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Indiquer l'adresse publiée et le port :</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Utiliser STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL du serveur</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Utiliser TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Domaine</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Négociation de session SDP (bascule sur ICE)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Ces paramètres sont uniquement utilisés durant la négociation de la session SDP au cas où ICE ne serait pas supporté par le serveur ou le correspondant.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Plage des ports RTP audio</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Minimum</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Maximum</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Plage des ports RTP vidéo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Sécurité</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Chiffrement du flux média (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Appareils</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Ajouter un nouvel appareil</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Pour ajouter un nouvel appareil à votre compte Ring, vous devez exporter votre compte sur le Ring. Cela génèrera un code PIN qui devra être saisi sur le nouvel appareil dans les 5 minutes suivant sa génération.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Mot de passe (requis) :</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Exporter sur le Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Votre code PIN généré :</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>NIP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>Ce NIP doit être saisi dans votre nouvel appareil dans les 5 prochaines minutes. Vous pouvez en générer un nouveau en tout temps.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Contacts bannis</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Adresse publiée</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Certificat CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Certificat utilisateur</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Clé privée</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Mot de passe clé privée</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Utiliser les modes de chiffrements par défaut</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Choisir un fichier</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Fichiers (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Veuillez patienter pendant que votre NIP est généré.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Erreur réseau, veuillez réessayer.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Mauvais mot de passe.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Enregistrement... Cela peut prendre un peu de temps</translation>
</message>
@@ -992,7 +1058,7 @@ Copiez-le et partagez-le avec vos amis !</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Vidéo</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Copiez-le et partagez-le avec vos amis !</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Comptes</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Copiez-le et partagez-le avec vos amis !</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importer</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Exporter</translation>
</message>
@@ -1236,25 +1292,20 @@ Copiez-le et partagez-le avec vos amis !</translation>
<translation>Lancer Ring au démarrage</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nouveau compte</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Êtes-vous certain de vouloir effacer l'historique ?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Choisir un répertoire</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Une erreur est survenue pendant l'import de compte.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copiez-le et partagez-le avec vos amis !</translation>
<translation>À Propos</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Chemin</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Mot de passe</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Ok</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Annuler</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Sauvegarder</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Fichiers d'archive Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Ouvrir un fichier</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copiez-le et partagez-le avec vos amis !</translation>
<translation>Aucun client email trouvé</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Compte Ring</translation>
@@ -1778,7 +1790,7 @@ Copiez-le et partagez-le avec vos amis !</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Configuration</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Copiez-le et partagez-le avec vos amis !</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Migration de votre compte Ring…</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Inconnu</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Enregistrement du nom d'utilisateur...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Ajouter un appareil</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Nom d'utilisateur indisponible</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Nom d'utilisateur disponible</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Nom d'utilisateur invalide</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Erreur de réseau</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copiez-le et partagez-le avec vos amis !</translation>
<translation>Lier cet appareil à un compte</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Comment ajouter un appareil</translation>
</message>
@@ -1877,7 +1904,7 @@ Copiez-le et partagez-le avec vos amis !</translation>
<translation>Bienvenue sur</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Créer votre profil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Entrer votre nom complet :</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Créer votre compte</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Choisissez un nom d'utilisateur</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Recherche de disponibilité...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>Enregistre votre nom d'utilisateur Ring.
Ceci réserve ce nom de façon définitive et uniquement pour votre usage.
@@ -1965,134 +1992,174 @@ Vos amis pourront vous appeler avec ce nom plutôt que votre RingID.</translatio
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Enregistrer un nom d'utilisateur public (expérimental)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Entrer votre code pin</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Mot de passe</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Génération de votre compte Ring…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Précédent</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Suivant</translation>
</message>
diff --git a/translations/ring_client_windows_fr_CA.ts b/translations/ring_client_windows_fr_CA.ts
index aae8e76..fcc2119 100644
--- a/translations/ring_client_windows_fr_CA.ts
+++ b/translations/ring_client_windows_fr_CA.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Nom d'utilisateur</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Mot de passe</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Autoriser les appels d'une source inconnue</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Autoriser les appels de vos contacts</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Paramètres du compte Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Sélection de sonneries</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Jouer</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Vidéo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Audio codecs</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Vidéo codecs</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avancé</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Enregistrement</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Interface réseau</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Utiliser le TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Max</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Sécurité</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Appareils</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Adresse publiée</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>clé privée</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Choisir le fichier</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Fichiers (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Mauvais mot de passe</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -990,7 +1056,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Vidéo</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1000,7 +1066,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Comptes</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1209,22 +1275,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importation</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Exportation</translation>
</message>
@@ -1234,25 +1290,20 @@ Copy and share it with your friends!</source>
<translation>Lancer Ring au démarrage</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nouveau compte</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Êtes-vous certain de vouloir effacer tout l'historique?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Choisir un répertoire</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Une erreur s'est produite lors de l'importation du compte</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1535,45 +1586,6 @@ Copy and share it with your friends!</source>
<translation>À propos</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Chemin d'accès</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Mot de passe</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Ok</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Annuler</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Enregistrer le fichier</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Fichier d'archive Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Ouvrir un fichier</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1633,7 +1645,7 @@ Copy and share it with your friends!</source>
<translation>Aucun client de courriel par défaut n'a été trouvé</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Compte Ring</translation>
@@ -1776,7 +1788,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Configuration</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1810,50 +1822,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Inconnu</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1865,7 +1892,7 @@ Copy and share it with your friends!</source>
<translation>Associer cet appareil à un compte</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1875,7 +1902,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1889,34 +1916,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Créer votre profil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1961,134 +1988,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Enregistrer un nom d'utilisateur public (expérimental)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Mot de passe</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Suivant</translation>
</message>
diff --git a/translations/ring_client_windows_fr_FR.ts b/translations/ring_client_windows_fr_FR.ts
index 3b0e0df..1cd0d16 100644
--- a/translations/ring_client_windows_fr_FR.ts
+++ b/translations/ring_client_windows_fr_FR.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>mot de passe</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -990,7 +1056,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1209,22 +1275,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"/>
</message>
@@ -1234,25 +1290,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1535,45 +1586,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>mot de passe</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Annuler</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1633,7 +1645,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1776,7 +1788,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Configuration</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1810,50 +1822,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Inconnu</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1865,7 +1892,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1875,7 +1902,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1889,34 +1916,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1961,134 +1988,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>mot de passe</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Suivant</translation>
</message>
diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts
index 3e9b08f..67dd6ec 100644
--- a/translations/ring_client_windows_he.ts
+++ b/translations/ring_client_windows_he.ts
@@ -89,14 +89,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>שם משתמש</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>סיסמה</translation>
</message>
@@ -121,17 +121,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP מאופשר</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -172,12 +172,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>אודיו/וידאו</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>מתקדם</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>רישום</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>ממשק רשת</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>פורט מקומי:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>זהה לפרמטרים מקומיים</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>קבע כתובת ופורט מפורסמים:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>כתובת</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>פורט</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL שרת</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>תחום</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>מינימום</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>מקסימום</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>אבטחה</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>התקנים</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>ביטול</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>תעודת CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>תעודת משתמש</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>מפתח פרטי</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>בחר קובץ</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>קבצים (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -991,7 +1057,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>אודיו/וידאו</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1001,7 +1067,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>חשבונות</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"/>
</message>
@@ -1235,25 +1291,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>חשבון חדש</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>האם אתה בטוח כי ברצונך לטהר את ההיסטוריה שלך?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Copy and share it with your friends!</source>
<translation>אודות</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>סיסמה</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>ביטול</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1777,7 +1789,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>תצורה</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1811,50 +1823,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>לא מוכר</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>סיסמה</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>כעת מפיק חשבון Ring שלך...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>קדימה</translation>
</message>
diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts
index 9c85548..642ad62 100644
--- a/translations/ring_client_windows_hi_IN.ts
+++ b/translations/ring_client_windows_hi_IN.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation type="unfinished"/>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>शुरू करें</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -1209,22 +1275,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"/>
</message>
@@ -1234,25 +1290,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1535,45 +1586,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1633,7 +1645,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1810,50 +1822,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1865,7 +1892,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1875,7 +1902,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1889,34 +1916,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1961,134 +1988,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts
index 8feb900..0fcd09d 100644
--- a/translations/ring_client_windows_hr.ts
+++ b/translations/ring_client_windows_hr.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Korisničko ime</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Lozinka</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP omogućen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Postavke Ring računa</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Odabir melodije zvona</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>izvodi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Audio kodeci</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Video kodeci</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Napredno</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registracija</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Mrežno sučelje</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Lokalni port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Isto kao i lokalni parametri</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adresa</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Koristi STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL poslužitelja</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Koristi TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Minimalno</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Maksimalno</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Sigurnost</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Poništi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>U redu</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Korisnički certifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Privatni ključ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Lozinka privatnog ključa</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pauza</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Izaberite datoteku</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Datoteke (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -990,7 +1056,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1000,7 +1066,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Računi</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1209,22 +1275,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Uvezi</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Izvezi</translation>
</message>
@@ -1234,25 +1290,20 @@ Copy and share it with your friends!</source>
<translation>Pokreni Ring pri paljenju računala</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Novi račun</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Jeste li sigurni da želite očistiti svu vašu povijest?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Izaberite direktorij</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1535,45 +1586,6 @@ Copy and share it with your friends!</source>
<translation>O programu</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Putanja</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Lozinka</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>U redu</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Poništi</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Spremi datoteku</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Otvori datoteku</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1633,7 +1645,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring račun</translation>
@@ -1776,7 +1788,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Konfiguracija</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1810,50 +1822,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Nepoznato</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1865,7 +1892,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1875,7 +1902,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1889,34 +1916,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Napravite vaš profil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Napravite vaš račun</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Izaberite vaše korisničko ime</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1961,134 +1988,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Lozinka</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Potvrdi lozinku</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Slijedeće</translation>
</message>
diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts
index 1e38d46..b561cdf 100644
--- a/translations/ring_client_windows_hu.ts
+++ b/translations/ring_client_windows_hu.ts
@@ -89,14 +89,14 @@ A Ring egy biztonságos és osztott kommunikációs szoftver</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Felhasználónév</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Jelszó</translation>
</message>
@@ -121,17 +121,17 @@ A Ring egy biztonságos és osztott kommunikációs szoftver</translation>
<translation>UPnP engedélyezve</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Hívások engedélyezése ismeretlenektől</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Hívások engedélyezése a partnerlista tagjaitól</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Hívások engedélyezése az előzményekben szereplőktől</translation>
</message>
@@ -172,12 +172,12 @@ A Ring egy biztonságos és osztott kommunikációs szoftver</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ A Ring egy biztonságos és osztott kommunikációs szoftver</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ringfiók beállításai</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Csengőhang kiválasztása</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Lejátszás</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Hang/videó</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Hangcodekek</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Videócodekek</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Haladó</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Regisztáció</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Regisztráció érvényességének lejárta (másodpercekben):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Hálózati interfész</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Helyi port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Ugyanaz, mint a helyi paraméterek</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Nyilvános cím és port megadása:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Cím</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>STUN használata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Szerver-URL</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>TURN használata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP munkamenet targyalás (az ICE tartaléka)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Ezek a beállítások csak az SDP munkamenet tárgyalásánál kerülnek használatra, ha a kiszolgáló vagy a partner nem támogatja az ICE-t</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Hang RTP port korlát</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Minimum</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Maximum</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Videó RTP port korlát</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Biztonság</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Média-adatfolyam titkosítása (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Eszközök</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Eszköz hozzáadása</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Ahhoz hogy új eszközt adjon a Ring fiókjához, exportálnia kell a fiókját a Ringen. Ez előállít egy PIN-t, amit meg kell adnia az új eszközén, az előállítástól számított 5 percen belül.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Mé_gse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Exportálás a Ringen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>A generált PIN:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>Rendben</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Nyilvános cím</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA-engedély</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Felhasználói engedély</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Privátkulcs</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Privátkulcs jelszava</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Alapértelmezett cipherek használata</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Megállítás</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Fájl kiválasztása</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Fájlok (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -992,7 +1058,7 @@ Másolja ki és ossza meg a barátaival!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Hang/videó</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Másolja ki és ossza meg a barátaival!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Fiókok</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Másolja ki és ossza meg a barátaival!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importálás</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Exportálás</translation>
</message>
@@ -1236,25 +1292,20 @@ Másolja ki és ossza meg a barátaival!</translation>
<translation>A Ring indítása rendszerindításkor</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Új fiók</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Biztos, hogy törölni akarja az összes előzményt?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Könyvtár kiválasztása</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Hiba történt a fiók importálása közben.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Másolja ki és ossza meg a barátaival!</translation>
<translation>Névjegy</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Útvonal</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Jelszó</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>OK</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Mégse</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Fájl mentése</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring archívumfájlok (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Fájl megnyitása</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Másolja ki és ossza meg a barátaival!</translation>
<translation>Nem találtam alapértelmezett levelezőklienst</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1778,7 +1790,7 @@ Másolja ki és ossza meg a barátaival!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Konfiguráció</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Másolja ki és ossza meg a barátaival!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Ismeretlen</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Másolja ki és ossza meg a barátaival!</translation>
<translation>Ezen eszköz fiókhoz kapcsolása</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1877,7 +1904,7 @@ Másolja ki és ossza meg a barátaival!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Jelszó</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>A Ringfiókja létrehozása…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Vissza</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Következő</translation>
</message>
diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts
index 9513c3c..dfef3ad 100644
--- a/translations/ring_client_windows_id.ts
+++ b/translations/ring_client_windows_id.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation type="unfinished"/>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -1209,22 +1275,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"/>
</message>
@@ -1234,25 +1290,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1535,45 +1586,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1633,7 +1645,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1810,50 +1822,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Tidak diketahui</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1865,7 +1892,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1875,7 +1902,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1889,34 +1916,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1961,134 +1988,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Selanjutnya</translation>
</message>
diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts
index 80d11cd..855ad4a 100644
--- a/translations/ring_client_windows_it.ts
+++ b/translations/ring_client_windows_it.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Nome utente</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Password</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP attivato</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Play</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avanzato</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registrazione</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Timeout di espirazione della registrazione (seconds):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Interfaccia di rete</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Identico alle impostazioni locali</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Digitare l'indirizzo pubblicato e il porto:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Indirizzo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Porta</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Usare STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Usare TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Negoziazione sessione SDP (sostituto a ICE)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Questi parametri sono usati unicamente durante la negoziazione di una sessione SDP nel caso in cui ICE non è sopportato dal server o peer.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Intervallo porti audio RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Massimo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Intervallo porti video RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Sicurezza</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Dispositivi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Cancella</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Indirizzo di publicazione</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Certificato dell'autorita</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Certificato utente</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Chiave privata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Password della chiave privata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Usare il cifrario di default</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -991,7 +1057,7 @@ Da copiare e condividere con gli amici!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1001,7 +1067,7 @@ Da copiare e condividere con gli amici!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Accounts</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Da copiare e condividere con gli amici!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importare</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Esportare</translation>
</message>
@@ -1235,25 +1291,20 @@ Da copiare e condividere con gli amici!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nuovo account</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Da copiare e condividere con gli amici!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Password</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Cancella</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Da copiare e condividere con gli amici!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1777,7 +1789,7 @@ Da copiare e condividere con gli amici!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Configurazione</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1811,50 +1823,65 @@ Da copiare e condividere con gli amici!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Sconosciuto</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Da copiare e condividere con gli amici!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Da copiare e condividere con gli amici!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Password</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Confermare password</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Generazione del account Ring in corso…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Seguente</translation>
</message>
diff --git a/translations/ring_client_windows_it_IT.ts b/translations/ring_client_windows_it_IT.ts
index 5a31d31..0898294 100644
--- a/translations/ring_client_windows_it_IT.ts
+++ b/translations/ring_client_windows_it_IT.ts
@@ -89,14 +89,14 @@ Ring è un software per comunicazioni sicure e distribuite.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Utente</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Password</translation>
</message>
@@ -121,17 +121,17 @@ Ring è un software per comunicazioni sicure e distribuite.</translation>
<translation>UPnP abilitato</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Permetti chiamate da sconosciuti</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Permetti chiamate dai contatti</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Permetti chiamate dalla cronologia</translation>
</message>
@@ -172,12 +172,12 @@ Ring è un software per comunicazioni sicure e distribuite.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring è un software per comunicazioni sicure e distribuite.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Opzioni dell'account Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Seleziona suoneria</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Avvia</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Codec audio</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Codec video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avanzato</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registrazione</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Scadenza timeout di registrazione (secondi):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Interfaccia di rete</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Porta locale</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Uguale ai parametri locali</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Imposta l'indirizzo pubblicato e la porta:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Indirizzo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Porta</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Utilizza STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL del server</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Utilizza TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Realm</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Negoziazione sessione SDP (usa ICE in caso contrario)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Queste impostazioni vengono utizzate solo durante la negoziazione della sessione SDP nel caso in cui ICE non sia supportato dal server o dal peer.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Intervallo porte audio RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Max</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Intervallo porte video RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Sicurezza</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Crittografia Media Stream (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Dispositivi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Aggiungi dispositivo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Per aggiungere un nuovo dispositivo al tuo account Ring, esporta il tuo account su Ring. Questo genererà un pin che deve essere immesso sul tuo nuovo dispositivo entro 5 minuti dalla sua generazione.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Esporta su Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Il pin generato per te:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Indirizzo Pubblico</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Certificato CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Certificato Utente</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Chiave Privata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Password Chiave Privata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Usa il cifrario di default</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Scegli un file</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Files (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Password errata.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -992,7 +1058,7 @@ Copialo e condividilo con i tuoi amici!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Copialo e condividilo con i tuoi amici!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Accounts</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Copialo e condividilo con i tuoi amici!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importa</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Esporta</translation>
</message>
@@ -1236,25 +1292,20 @@ Copialo e condividilo con i tuoi amici!</translation>
<translation>Esegui Ring all'avvio</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nuovo Account</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Sei sicuro di voler cancellare tutta la cronologia?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Scegli Cartella</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Un errore è occorso durante l'importazione dell'account.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copialo e condividilo con i tuoi amici!</translation>
<translation>Info</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Percorso</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Password</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Ok</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Annulla</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Salva File</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>File archivio di RIng (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Apri File</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copialo e condividilo con i tuoi amici!</translation>
<translation>Nessun client E-Mail di Default</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Account Ring</translation>
@@ -1778,7 +1790,7 @@ Copialo e condividilo con i tuoi amici!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Configurazione</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Copialo e condividilo con i tuoi amici!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Sconosciuto</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copialo e condividilo con i tuoi amici!</translation>
<translation>Collega questo dispositivo ad un account</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1877,7 +1904,7 @@ Copialo e condividilo con i tuoi amici!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Crea il tuo profilo</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Crea il tuo account</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Registra un nome utente pubblico (sperimentale)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Password</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Conferma password</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Generazione del tuo account Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Precedente</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Prossimo</translation>
</message>
diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts
index d971894..325dd54 100644
--- a/translations/ring_client_windows_ja.ts
+++ b/translations/ring_client_windows_ja.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>ユーザー名</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>パスワード</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP 有効</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>再生</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>音声/動画</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>詳細</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>登録</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>ネットワークインターフェイス</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>ローカルパラメーターと同じ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>アドレス</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>ポート番号</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>TURNを使用</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>音声 RTP ポートの範囲</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>最小</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>最大</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>セキュリティ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>端末</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>発行されたアドレス</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>プライベートキー</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>パスワードが間違っています。</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -991,7 +1057,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>音声/動画</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1001,7 +1067,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>アカウント</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>エクスポート</translation>
</message>
@@ -1235,25 +1291,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>新規アカウント</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>パスワード</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>OK</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>キャンセル</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ringアカウント</translation>
@@ -1777,7 +1789,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>設定</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1811,50 +1823,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>不明</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Copy and share it with your friends!</source>
<translation>このデバイスをアカウントへリンク</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>プロフィールを作成</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>公開ユーザー名を登録 (実験的)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>パスワード</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>パスワードの再入力</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>次へ</translation>
</message>
diff --git a/translations/ring_client_windows_ko_KR.ts b/translations/ring_client_windows_ko_KR.ts
index bfc9a1f..15d1981 100644
--- a/translations/ring_client_windows_ko_KR.ts
+++ b/translations/ring_client_windows_ko_KR.ts
@@ -89,14 +89,14 @@ Ring은 보안 기능을 가진 분산 커뮤니케이션 소프트웨어입니
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>사용자명</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>암호</translation>
</message>
@@ -121,17 +121,17 @@ Ring은 보안 기능을 가진 분산 커뮤니케이션 소프트웨어입니
<translation>UPnP 가능여부</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>모르는 사람과 통화 허용</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>연락처 등록된 사람과 통화 허용</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>통화이력으로부터 통화 허용</translation>
</message>
@@ -172,12 +172,12 @@ Ring은 보안 기능을 가진 분산 커뮤니케이션 소프트웨어입니
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>블록체인에 등록</translation>
</message>
@@ -222,448 +222,514 @@ Ring은 보안 기능을 가진 분산 커뮤니케이션 소프트웨어입니
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ring 계정 설정</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>통화음 선택</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>재생</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>오디오/비디오</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>오디오 코덱</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>비디오 코덱</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>등록</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>등록 유효 시간(초):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>네트워크 인터페이스</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>공개 주소와 포트 설정하기</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>주소</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>포트</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>STUN 사용</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>서버 URL</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>TURN 사용</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>최소</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>최대</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>비디오 RTP 포트 범위</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>보안</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>미디어 스트림 암호화 (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>장치</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>장치 추가하기</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>암호 (필수)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>취소</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>이 PIN 번호는 5분 안에 새로운 장비에 입력해야 합니다. 언제든지 새로운 번호를 다시 생성할 수 있습니다.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>차단한 연락처</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>공개 주소</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>개인키</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>개인키 암호</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>기본 ciphers 사용하기</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>멈춤</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>파일 선택</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>파일들 (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>PIN을 생성하는 동안 잠시만 기다려주세요.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>네트워크 오류입니다. 잠시 후 다시 시도하세요.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>잘못된 암호입니다.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>등록중... 잠시만 기다려주세요.</translation>
</message>
@@ -992,7 +1058,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>오디오/비디오</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1211,22 +1277,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>가져오기</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>내보내기</translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation>시작 시 Ring 실행</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>새 계정</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>디렉토리 선택</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>계정 가져오기 중 오류가 발생하였습니다.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>경로</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>암호</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>확인</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>취소</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <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"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>파일 열기</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation>기본 메일 클라이언트를 찾을 수 없습니다.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring 계정</translation>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>당신의 계정은 이전이 필요합니다. 암호를 입력하세요.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>당신의 Ring 계정을 이전 중입니다.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>당신의 공개 사용자명을 등록 중입니다. 잠시만 기다리세요.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>장치 추가하기</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>사용할 수 없는 사용자명입니다.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>사용 가능한 사용자명입니다.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>올바르지 않은 사용자명입니다.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>네트워크 오류</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation>이 장치를 계정에 연결하기</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>장치를 추가하는 법</translation>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation>환영합니다</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>프로필 만들기</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>풀 네임을 입력하세요:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>계정 생성하기</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>사용자명 선택</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>검색 중...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>공개 사용자명을 등록하세요 (실험중)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>PIN 번호를 입력하세요.</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>암호</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>암호 확인</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Ring 계정 생성 중...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>이전</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>다음</translation>
</message>
diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index 9f1026b..f27a457 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -89,14 +89,14 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Naudotojo vardas</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Slaptažodis</translation>
</message>
@@ -121,17 +121,17 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
<translation>UPnP įjungta</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Leisti skambučius nuo nepažįstamųjų</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Leisti skambučius nuo kontaktų</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Leisti skambučius iš istorijos</translation>
</message>
@@ -172,12 +172,12 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Registruoti blokų grandinėje</translation>
</message>
@@ -222,448 +222,514 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ring paskyros nustatymai</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Skambučio melodijos pasirinkimas</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Groti</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Garsas/Vaizdas</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Garso kodekai</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Vaizdo kodekai</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Išplėstiniai</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registracija</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Registracijos galiojimo pabaigos laiko limitas (sekundžių):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Tinklo sąsaja</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Vietinis prievadas:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Toks pats kaip vietiniai parametrai</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Nustatyti paskelbtą adresą ir prievadą:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adresas</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Prievadas</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Naudoti STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Serverio URL</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Naudoti TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Sritis</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP seanso derėjimasis (ICE surogatas)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Šie nustatymai yra naudojami tik SDP seanso derėjimosi metu tuo atveju, jei serveris arba naudotojas nepalaiko ICE.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Garso RTP prievadų rėžis</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Maž.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Didž.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Vaizdo RTP prievadų rėžis</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Saugumas</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Medija srauto šifravimas (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Įrenginiai</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Pridėti įrenginį</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Norėdami pridėti naują įrenginį į savo Ring paskyrą, jūs eksportuojate savo paskyrą Ring sistemoje. Tai sukurs pin, kurį per 5 minutes nuo jo sukūrimo reikės įvesti jūsų naujame įrenginyje.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Slaptažodis (būtinas)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Atsisakyti</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Eksportuoti Ring sistemoje</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Jūsų sukurtas pin:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>Šis PIN per 5 minutes turėtų būti įvestas jūsų naujame įrenginyje. Naują PIN galite sukurti bet kuriuo metu.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>Gerai</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Užblokuoti kontaktai</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Paskelbtas adresas</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>LĮ liudijimas</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Naudotojo liudijimas</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Privatusis raktas</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Privačiojo rakto slaptažodis</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Naudoti numatytuosius šifrus</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pristabdyti</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Pasirinkti failą</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Failai (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Prašome palaukti, kol yra kuriamas jūsų PIN.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Tinklo klaida. Prašome vėliau bandyti dar kartą.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Neteisingas slaptažodis.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Registruojama... Tai gali šiek tiek užtrukti</translation>
</message>
@@ -992,7 +1058,7 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Garsas/Vaizdas</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Paskyros</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importuoti</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Eksportuoti</translation>
</message>
@@ -1236,25 +1292,20 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
<translation>Paleisti Ring, įjungus kompiuterį</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nauja paskyra</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Ar tikrai norite išvalyti visą savo istoriją?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Pasirinkti katalogą</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Importuojant paskyrą, įvyko klaida.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
<translation>Apie</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Kelias</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Slaptažodis</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Gerai</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Atsisakyti</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Įrašyti failą</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring archyvo failai (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Atverti failą</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
<translation>Numatytoji pašto kliento programa nerasta</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring paskyra</translation>
@@ -1778,7 +1790,7 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Konfigūracija</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>Jūsų paskyra turi būti perkelta. Įveskite savo slaptažodį.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Perkeliama jūsų Ring paskyra...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Nežinoma</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Registruojamas jūsų viešasis naudotojo vardas, tai gali užtrukti kelias minutes...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Pridėti įrenginį</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Naudotojo vardas neprieinamas.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Naudotojo vardas yra prieinamas.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Naudotojo vardas yra neteisingas.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Tinklo klaida.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
<translation>Susieti šį įrenginį su paskyra</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Kaip pridėti įrenginį</translation>
</message>
@@ -1877,7 +1904,7 @@ Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
<translation> Sveiki atvykę į</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1900,46 +1927,46 @@ p, li { white-space: pre-wrap; }
<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;">Jūs gausite šiai formai užpildyti reikalingą PIN kodą. PIN kodas galios tik </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minučių</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Susikurkite savo profilį</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Įveskite savo visą vardą:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Susikurkite savo paskyrą</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Pasirinkite savo naudotojo vardą</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Ieškoma...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>Užregistruokite savo naudotojo vardą Ring sistemoje. Tai rezervuos naudotojo vardą ir tokiu būdu tik jūs galėsite jį naudoti. Jūsų draugai galės jums skambinti, vietoj jūsų RingID, naudodami jūsų naudotojo vardą.</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="33"/>
<source>Wizard Dialog</source>
- <translation type="unfinished"/>
+ <translation>Vediklio dialogas</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="36"/>
<source>Account creation wizard dialog</source>
- <translation type="unfinished"/>
+ <translation>Paskyros sukūrimo vediklio dialogas</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="72"/>
@@ -1972,134 +1999,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Registruoti viešąjį naudotojo vardą (eksperimentinis)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Įveskite savo pin</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Slaptažodis</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Patvirtinkite slaptažodį</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Kuriama jūsų Ring paskyra...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Ankstesnis</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Kitas</translation>
</message>
diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts
index c3ce89f..2e507af 100644
--- a/translations/ring_client_windows_ms.ts
+++ b/translations/ring_client_windows_ms.ts
@@ -89,14 +89,14 @@ Ring adalah aplikasi komunikasi yang sulit dan tersebar.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Nama pengguna</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Kara laluan</translation>
</message>
@@ -121,17 +121,17 @@ Ring adalah aplikasi komunikasi yang sulit dan tersebar.</translation>
<translation>UPnP diaktifkan</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Benarkan Panggilan Daripada TidaK Diketahui</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Benarkan Panggilan Daripada Kenalan</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Benarkan Panggilan Daripada Sejarah</translation>
</message>
@@ -172,12 +172,12 @@ Ring adalah aplikasi komunikasi yang sulit dan tersebar.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring adalah aplikasi komunikasi yang sulit dan tersebar.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Tetapan Akaun Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Pilihan Nada Bunyi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Main</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Codec Audio</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Codec Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Lanjut</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Pendaftaran</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Guna TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Jarak Port Bunyi RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Penyulitan</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Perangkat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Batal</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Alamat server pengagihan</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -991,7 +1057,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1001,7 +1067,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Akaun</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Eksport</translation>
</message>
@@ -1235,25 +1291,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Copy and share it with your friends!</source>
<translation>Tentang</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Kara laluan</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Batal</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Akaun Ring</translation>
@@ -1777,7 +1789,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Konfigurasi</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1811,50 +1823,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Tidak diketahui</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Copy and share it with your friends!</source>
<translation>Sambungkan perangkat ini dengan akaun</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Kara laluan</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Sahkan kata laluan</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts
index 76a5886..818c8f7 100644
--- a/translations/ring_client_windows_nb.ts
+++ b/translations/ring_client_windows_nb.ts
@@ -10,12 +10,12 @@
<message>
<location filename="../aboutdialog.ui" line="462"/>
<source>about button</source>
- <translation type="unfinished"/>
+ <translation>om-knapp</translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="478"/>
<source>credits button</source>
- <translation type="unfinished"/>
+ <translation>bidragsytere-knapp</translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="481"/>
@@ -31,7 +31,8 @@
<location filename="../aboutdialog.ui" line="563"/>
<source>The Microsoft Windows client for Ring.
Ring is a secured and distributed communication software.</source>
- <translation type="unfinished"/>
+ <translation>Windows-klienten for Ring.
+Ring er sikker og distribuert kommunikasjonsprogramvare.</translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="30"/>
@@ -88,21 +89,21 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Brukernavn</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Passord</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="515"/>
<source>Proxy</source>
- <translation>Proxy</translation>
+ <translation>Mellomtjener</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="558"/>
@@ -120,39 +121,39 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP aktivt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
- <translation type="unfinished"/>
+ <translation>Tillat anrop fra ukjente</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Tillat anrop fra kontakt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Tillat samtale fra historikk</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="69"/>
<source>General account info configuration</source>
- <translation type="unfinished"/>
+ <translation>Grunnleggende kontoinfo-oppsett</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="169"/>
<source>Displayed name</source>
- <translation type="unfinished"/>
+ <translation>Vist navn</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="191"/>
<source>Displayed alias input</source>
- <translation type="unfinished"/>
+ <translation>Vist alias-inndata</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="302"/>
<source>Hostname URL for DHT bootstrap or SIP</source>
- <translation type="unfinished"/>
+ <translation>Vertsnavn-URL for DHT-oppstartsprosedyre eller SIP</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="323"/>
@@ -162,21 +163,21 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../accountdetails.ui" line="350"/>
<source>Ring public registered username</source>
- <translation type="unfinished"/>
+ <translation>Ring offentlig registrert brukernavn</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="369"/>
<source>Register username on blockchain button</source>
- <translation type="unfinished"/>
+ <translation>Registrer brukernavn på blokkjede-knapp</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Registrer på blokkjeden</translation>
</message>
@@ -188,481 +189,547 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../accountdetails.ui" line="411"/>
<source>Nameservice URL input</source>
- <translation type="unfinished"/>
+ <translation>Navnetjenestenettadresse-inndata</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="448"/>
<source>SIP username input</source>
- <translation type="unfinished"/>
+ <translation>SIP-brukernavn -inndata</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="491"/>
<source>SIP password input</source>
- <translation type="unfinished"/>
+ <translation>SIP-passord -inndata</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="537"/>
<source>SIP proxy URL input</source>
- <translation type="unfinished"/>
+ <translation>SIP-mellomtjener -inndata</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="580"/>
<source>SIP voicemail number</source>
- <translation type="unfinished"/>
+ <translation>SIP-talepostkassenummer</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="592"/>
<source>Autoanswer call checkbox</source>
- <translation type="unfinished"/>
+ <translation>Autosvar anrop -avkryssningsboks</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="613"/>
<source>UPnP enabled checkbox</source>
+ <translation>UPnP aktivert -avkryssningsboks</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Kontoinnstillinger for Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
- <translation type="unfinished"/>
+ <translation>Tillat anrop fra ukjente -avkryssningsboks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
- <translation type="unfinished"/>
+ <translation>Tillat anrop fra historikk -avkryssningsboks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
- <translation type="unfinished"/>
+ <translation>Tillat anrop fra kontakt -avkryssningsboks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Ringetonevalg</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
- <translation type="unfinished"/>
+ <translation>Spill av ringetone -knapp</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Spill av</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
- <translation type="unfinished"/>
+ <translation>ringetonefilvalg</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
- <translation>Lyd/Bilde</translation>
+ <translation>Lyd/bilde</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
- <translation type="unfinished"/>
+ <translation>Oppsett av foretrukne lyd-/video -kodek</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Lydkodek</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Videokodek</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avansert</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
- <translation type="unfinished"/>
+ <translation>Avansert kontooppsett</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registrering</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Tidsgrense for registrering (sekunder):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
- <translation type="unfinished"/>
+ <translation>Registreringstidsavbruddvelger-tallboks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Nettverksgrensesnitt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Lokal port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
- <translation type="unfinished"/>
+ <translation>lokal portvelger -tallboks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
- <translation type="unfinished"/>
+ <translation>samme som lokal radioknapp</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Samme som lokale parametre</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
- <translation type="unfinished"/>
+ <translation>personaliser adresse og porter -radioknapp</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Oppgi publisert adresse og port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
- <translation type="unfinished"/>
+ <translation>tekstinntasting for IP-adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
- <translation type="unfinished"/>
+ <translation>portvelger -tallboks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
- <translation type="unfinished"/>
+ <translation>bruk STUN-avkryssningsboks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Bruk STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Nettadresse for tjener</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
- <translation type="unfinished"/>
+ <translation>bruk TURN-avkryssningsboks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Bruk TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
- <translation type="unfinished"/>
+ <translation>TURN-tjenernettadresse -inndata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
- <translation type="unfinished"/>
+ <translation>TURN-tjenerbrukernavn -inndata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
- <translation type="unfinished"/>
+ <translation>TURN-tjenerpassord -inndata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
- <translation type="unfinished"/>
+ <translation>TURN-tjenerområde -inndata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
- <translation type="unfinished"/>
+ <translation>Område</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP-øktforhandling (ICE-reserve)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Disse innstillingene brukes kun for SDP-øktforhandling hvis ICE ikke støttes av tjeneren til motparten.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>RTP-portintervall for tale</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
- <translation type="unfinished"/>
+ <translation>Nedre grense for RTP-portlydområdevelger</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
- <translation>Maks</translation>
+ <translation>Maks.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
- <translation type="unfinished"/>
+ <translation>Øvre grense for RTP-portlydområdevelger</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>RTP-portintervall for video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Sikkerhet</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
- <translation type="unfinished"/>
+ <translation>Kontosikkerhetsoppsett</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
- <translation type="unfinished"/>
+ <translation>Sertifikatsmyndighetssertifikat-velger</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
- <translation type="unfinished"/>
+ <translation>Brukersertifikat-velger</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
- <translation type="unfinished"/>
+ <translation>privat nøkkelpassord-inndata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
- <translation type="unfinished"/>
+ <translation>Privat nøkkel for bruker-velger</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
- <translation type="unfinished"/>
+ <translation>Krypter mediastrøm (SRTP)-avkryssningsboks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
- <translation type="unfinished"/>
+ <translation>Mediastrømkryptering (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
- <translation type="unfinished"/>
+ <translation>bruk forvalgt krypteringsalgoritme-avkryssningsboks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Enheter</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
- <translation type="unfinished"/>
+ <translation>Kontoenhetsbehandling</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
- <translation type="unfinished"/>
+ <translation>Legg til enhet-knapp</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Legg til enhet</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>For å legge en ny enhet til din Ring-konto, eksporterer du din konto på Ring. Dette vil generere en PIN som må skrives inn på din nye enhet i løpet av 5 minutter.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
- <translation type="unfinished"/>
+ <translation>Passordstekstinndata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Passord (kreves)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
- <translation type="unfinished"/>
+ <translation>Avbryt kontoeksport for lenking -knapp</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
- <translation type="unfinished"/>
+ <translation>Verifisert eksporter på DHT for enhetslenking -knapp</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Eksporter på Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Din genererte PIN:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
- <translation type="unfinished"/>
+ <translation>Generert PIN for sammenlenking</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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"/>
+ <translation>Denne PIN-koden må skrives inn på din nye enhet i løpet av fem minutter. Du kan generere en ny hvert øyeblikk.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
- <translation type="unfinished"/>
+ <translation>Godta PIN-generering og avslutt-knapp</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Bannlyste kontakter</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
- <translation type="unfinished"/>
+ <translation>Behandling av kontakter som er bannlyst fra kontoen -fane</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Publisert adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA-sertifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Brukersertifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Privat nøkkel</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Passord for privatnøkkel</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
- <translation>Bruk standardsifer</translation>
+ <translation>Bruk forvalgte krypteringsalgoritmer</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Velg fil</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Filer (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Vent mens din PIN blir generert.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Nettverksfeil. Prøv igjen senere.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Feil passord.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Registrerer… Dette kan ta litt tid</translation>
</message>
@@ -677,7 +744,7 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../bannedcontactswidget.ui" line="41"/>
<source>Banned contacts list</source>
- <translation type="unfinished"/>
+ <translation>Liste over bannlyste kontakter</translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="69"/>
@@ -687,7 +754,7 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../bannedcontactswidget.ui" line="101"/>
<source>Deban contact button</source>
- <translation type="unfinished"/>
+ <translation>Fjern bannlysning av kontakt -knapp</translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="104"/>
@@ -700,12 +767,12 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../callutilsdialog.ui" line="53"/>
<source>existing contacts list</source>
- <translation type="unfinished"/>
+ <translation>eksisterende kontaktliste</translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="68"/>
<source>contact transfer number text entry</source>
- <translation type="unfinished"/>
+ <translation>kontaktnummertekstoverføring -oppføring</translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="71"/>
@@ -715,7 +782,7 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../callutilsdialog.ui" line="110"/>
<source>Transfer call button</source>
- <translation type="unfinished"/>
+ <translation>Overfør samtale-knapp</translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="113"/>
@@ -748,17 +815,17 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../callwidget.ui" line="207"/>
<source>Search contact text input</source>
- <translation type="unfinished"/>
+ <translation>Søk etter kontakttekst -inndata</translation>
</message>
<message>
<location filename="../callwidget.ui" line="248"/>
<source>search button</source>
- <translation type="unfinished"/>
+ <translation>søkeknapp</translation>
</message>
<message>
<location filename="../callwidget.ui" line="557"/>
<source>Configuration menu</source>
- <translation type="unfinished"/>
+ <translation>Oppsettsmeny</translation>
</message>
<message>
<location filename="../callwidget.ui" line="680"/>
@@ -770,12 +837,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../callwidget.ui" line="791"/>
<source>Show ring ID QR code</source>
- <translation type="unfinished"/>
+ <translation>Vis QR-kode for ring ID</translation>
</message>
<message>
<location filename="../callwidget.ui" line="842"/>
<source>Share ring ID button</source>
- <translation type="unfinished"/>
+ <translation>Del ring ID -knapp</translation>
</message>
<message>
<location filename="../callwidget.ui" line="900"/>
@@ -792,12 +859,12 @@ Kopier og del den med dine venner!</translation>
<location filename="../callwidget.ui" line="1069"/>
<location filename="../callwidget.ui" line="1840"/>
<source>Back to homepage button</source>
- <translation type="unfinished"/>
+ <translation>Tilbake til hjemmeside -knapp</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1189"/>
<source>Peer contact method selector</source>
- <translation type="unfinished"/>
+ <translation>Likemannskontaktmetode -velger</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1208"/>
@@ -808,7 +875,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../callwidget.ui" line="1237"/>
<source>Start the conversation !</source>
- <translation type="unfinished"/>
+ <translation>Start sludringen!</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1314"/>
@@ -823,7 +890,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../callwidget.ui" line="1459"/>
<source>BestId</source>
- <translation type="unfinished"/>
+ <translation>BesteID</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1469"/>
@@ -833,12 +900,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../callwidget.ui" line="1498"/>
<source>Answer incoming call button</source>
- <translation type="unfinished"/>
+ <translation>Svar innkommende anrop -knapp </translation>
</message>
<message>
<location filename="../callwidget.ui" line="1543"/>
<source>Ignore incoming call button</source>
- <translation type="unfinished"/>
+ <translation>Ignorer innkommende anrop -knapp</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1570"/>
@@ -858,7 +925,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../callwidget.ui" line="1726"/>
<source>Cancel outgoing call</source>
- <translation type="unfinished"/>
+ <translation>Avbryt utgående anrop</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1749"/>
@@ -903,7 +970,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../callwidget.cpp" line="263"/>
<source>Message incoming from %1</source>
- <translation type="unfinished"/>
+ <translation>Melding ankommer fra %1</translation>
</message>
<message>
<location filename="../callwidget.cpp" line="301"/>
@@ -913,7 +980,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../callwidget.cpp" line="307"/>
<source>Call Number</source>
- <translation type="unfinished"/>
+ <translation>Ring nummer</translation>
</message>
<message>
<location filename="../callwidget.cpp" line="308"/>
@@ -963,7 +1030,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../combar.ui" line="72"/>
<source>Call button</source>
- <translation type="unfinished"/>
+ <translation>Ringeknapp</translation>
</message>
</context>
<context>
@@ -976,7 +1043,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="97"/>
<source>General configuration tab</source>
- <translation type="unfinished"/>
+ <translation>Fane for grunnleggende oppsett</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="103"/>
@@ -986,22 +1053,22 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="119"/>
<source>Audio / Video configuration tab</source>
- <translation type="unfinished"/>
+ <translation>Oppsettsfane for lyd/video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Lyd/Bilde</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
<source>Accounts configuration tab</source>
- <translation type="unfinished"/>
+ <translation>Oppsettsfane for kontoer</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Kontoer</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1051,12 +1118,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="288"/>
<source>Avatar (click to change)</source>
- <translation type="unfinished"/>
+ <translation>Avatar (klikk for å bytte)</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="311"/>
<source>Display name text input</source>
- <translation type="unfinished"/>
+ <translation>Vis navnetekst-inndata</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="314"/>
@@ -1066,12 +1133,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="400"/>
<source>Number of days of history kept</source>
- <translation type="unfinished"/>
+ <translation>Antall dager å beholde historikk</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="484"/>
<source>clear history button</source>
- <translation type="unfinished"/>
+ <translation>tøm historikk -knapp</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="527"/>
@@ -1086,12 +1153,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="573"/>
<source>Call records path</source>
- <translation type="unfinished"/>
+ <translation>Sti for anropshistorikk</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="603"/>
<source>Always record calls checkbox</source>
- <translation type="unfinished"/>
+ <translation>Alltid ta opp samtaler -avkryssningsboks</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="609"/>
@@ -1101,12 +1168,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="661"/>
<source>keep minimized on close checkbox</source>
- <translation type="unfinished"/>
+ <translation>behold minimisert ved lukking -avkryssningsboks</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="679"/>
<source>enable notifications checkbox</source>
- <translation type="unfinished"/>
+ <translation>skru på merknader -avkryssningsboks</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="685"/>
@@ -1116,12 +1183,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="703"/>
<source>Launch ring on startup checkbox</source>
- <translation type="unfinished"/>
+ <translation>Kjør Ring ved oppstart -avkryssningsboks</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="732"/>
<source>Autamatic update checks checkbox</source>
- <translation type="unfinished"/>
+ <translation>Automatisk oppdateringssjekker -avkryssningsboks</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="738"/>
@@ -1131,7 +1198,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="757"/>
<source>Interval between update checks in days selector</source>
- <translation type="unfinished"/>
+ <translation>Intervall mellom oppdateringssjekker i dager -velger</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="778"/>
@@ -1141,7 +1208,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="817"/>
<source>Check for updates now button</source>
- <translation type="unfinished"/>
+ <translation>Se etter oppdateringer nå -knapp</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="933"/>
@@ -1157,7 +1224,7 @@ Kopier og del den med dine venner!</translation>
<location filename="../configurationwidget.ui" line="1042"/>
<location filename="../configurationwidget.ui" line="1061"/>
<source>Video device selector</source>
- <translation type="unfinished"/>
+ <translation>Videoenhetsvelger</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1048"/>
@@ -1172,7 +1239,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="1095"/>
<source>Video device resolution selector</source>
- <translation type="unfinished"/>
+ <translation>Videoenhets-oppløsnings-velger</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1122"/>
@@ -1182,7 +1249,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="1129"/>
<source>Audio output device selector</source>
- <translation type="unfinished"/>
+ <translation>Lydutdataenhet-velger</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1141"/>
@@ -1192,12 +1259,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="1148"/>
<source>Audio input device selector</source>
- <translation type="unfinished"/>
+ <translation>Lydinndataenhets-velger</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1226"/>
<source>New account type selector</source>
- <translation type="unfinished"/>
+ <translation>Ny kontotype-velger</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1245"/>
@@ -1207,25 +1274,15 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../configurationwidget.ui" line="1283"/>
<source>Delete account button</source>
- <translation type="unfinished"/>
+ <translation>Slett konto-knapp</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importer</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
- <translation type="unfinished"/>
+ <translation>Eksporter konto -knapp</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Eksporter</translation>
</message>
@@ -1235,25 +1292,20 @@ Kopier og del den med dine venner!</translation>
<translation>Kjør Ring ved oppstart</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Ny konto</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Er du sikker på at du vil tømme all din historikk?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Velg mappe</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>En feil inntraff under importering av konto.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1265,7 +1317,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../contactpicker.ui" line="43"/>
<source>search existing contact text entry</source>
- <translation type="unfinished"/>
+ <translation>søk etter eksisterende kontakttekst -oppføring</translation>
</message>
<message>
<location filename="../contactpicker.ui" line="46"/>
@@ -1275,12 +1327,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../contactpicker.ui" line="56"/>
<source>existing contacts list</source>
- <translation type="unfinished"/>
+ <translation>eksisterende kontaktliste</translation>
</message>
<message>
<location filename="../contactpicker.ui" line="63"/>
<source>Create new contact button</source>
- <translation type="unfinished"/>
+ <translation>Opprett ny kontakt -knapp</translation>
</message>
<message>
<location filename="../contactpicker.ui" line="66"/>
@@ -1295,7 +1347,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../contactpicker.ui" line="108"/>
<source>New contact name text entry</source>
- <translation type="unfinished"/>
+ <translation>Ny kontaktnavnstekst -oppføring</translation>
</message>
<message>
<location filename="../contactpicker.ui" line="111"/>
@@ -1305,12 +1357,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../contactpicker.ui" line="141"/>
<source>Validate contact creation button</source>
- <translation type="unfinished"/>
+ <translation>Veifiser kontaktopprettelse -knapp</translation>
</message>
<message>
<location filename="../contactpicker.ui" line="144"/>
<source>Create</source>
- <translation>Lag</translation>
+ <translation>Opprett</translation>
</message>
</context>
<context>
@@ -1328,17 +1380,17 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../contactrequestwidget.ui" line="87"/>
<source>nameLabel</source>
- <translation type="unfinished"/>
+ <translation>navneEtikett</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="103"/>
<source>bestIdLabel</source>
- <translation type="unfinished"/>
+ <translation>BesteID-etikett</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="125"/>
<source>Accept contact request button</source>
- <translation type="unfinished"/>
+ <translation>Godta kontaktforespørsels-knapp</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="132"/>
@@ -1348,17 +1400,17 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../contactrequestwidget.ui" line="151"/>
<source>Mute contact request</source>
- <translation type="unfinished"/>
+ <translation>Forespørsel om demping av kontakt</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="158"/>
<source>Discard</source>
- <translation type="unfinished"/>
+ <translation>Avslå</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="177"/>
<source>Ban contact request</source>
- <translation type="unfinished"/>
+ <translation>Bannlys kontaktforespørsel</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="184"/>
@@ -1376,17 +1428,17 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../currentaccountwidget.ui" line="97"/>
<source>Account avatar</source>
- <translation type="unfinished"/>
+ <translation>Kontoavatar</translation>
</message>
<message>
<location filename="../currentaccountwidget.ui" line="128"/>
<source>Account status</source>
- <translation type="unfinished"/>
+ <translation>Kontostatus</translation>
</message>
<message>
<location filename="../currentaccountwidget.ui" line="141"/>
<source>account selection combobox</source>
- <translation type="unfinished"/>
+ <translation>kontovalg -kombinasjonsboks</translation>
</message>
</context>
<context>
@@ -1394,7 +1446,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../deleteaccountdialog.ui" line="14"/>
<source>Ring - account deletion</source>
- <translation type="unfinished"/>
+ <translation>Ring - kontosletting</translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="33"/>
@@ -1409,12 +1461,12 @@ Kopier og del den med dine venner!</translation>
<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"/>
+ <translation>Hvis denne kontoen ikke har blitt eksportert, eller lagt til på en annen enhet, vil den gå tapt</translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="138"/>
<source>Cancel contact deletion button</source>
- <translation type="unfinished"/>
+ <translation>Avbryt kontosletting -knapp</translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="141"/>
@@ -1424,7 +1476,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../deleteaccountdialog.ui" line="167"/>
<source>Validate contact deletion button</source>
- <translation type="unfinished"/>
+ <translation>Verifiser kontaktsletting -knapp</translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="170"/>
@@ -1437,17 +1489,17 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../deletecontactdialog.ui" line="20"/>
<source>Dialog</source>
- <translation type="unfinished"/>
+ <translation>Dialogvindu</translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="47"/>
<source>Do you want to delete this contact?</source>
- <translation type="unfinished"/>
+ <translation>Ønsker du å slette denne kontakten?</translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="123"/>
<source>Cancel contact deletion button</source>
- <translation type="unfinished"/>
+ <translation>Avbryt kontosletting -knapp</translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="126"/>
@@ -1457,7 +1509,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../deletecontactdialog.ui" line="139"/>
<source>Delete contact validation button</source>
- <translation type="unfinished"/>
+ <translation>Slett kontaktverifiserings-knapp</translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="142"/>
@@ -1467,7 +1519,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../deletecontactdialog.ui" line="155"/>
<source>Delete and ban validation button</source>
- <translation type="unfinished"/>
+ <translation>Slett og bannlys verifiserings-knapp</translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="158"/>
@@ -1480,12 +1532,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../instantmessagingwidget.ui" line="38"/>
<source>Message list</source>
- <translation type="unfinished"/>
+ <translation>Meldingsliste</translation>
</message>
<message>
<location filename="../instantmessagingwidget.ui" line="74"/>
<source>Message input</source>
- <translation type="unfinished"/>
+ <translation>Meldingsinndata</translation>
</message>
<message>
<location filename="../instantmessagingwidget.ui" line="77"/>
@@ -1495,7 +1547,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../instantmessagingwidget.ui" line="99"/>
<source>Send message button</source>
- <translation type="unfinished"/>
+ <translation>Meldingsforsendelsesknapp</translation>
</message>
<message>
<location filename="../instantmessagingwidget.cpp" line="44"/>
@@ -1536,51 +1588,12 @@ Kopier og del den med dine venner!</translation>
<translation>Om</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Sti</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Passord</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>OK</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Avbryt</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Lagre fil</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Åpne fil</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
<location filename="../photoboothdialog.ui" line="14"/>
<source>Photobooth</source>
- <translation type="unfinished"/>
+ <translation>Fotoboks</translation>
</message>
</context>
<context>
@@ -1593,7 +1606,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../photoboothwidget.ui" line="20"/>
<source>Photobooth display</source>
- <translation type="unfinished"/>
+ <translation>Fotoboksvisning</translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="51"/>
@@ -1634,7 +1647,7 @@ Kopier og del den med dine venner!</translation>
<translation>Fant ingen forvalgt e-postklient</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring-konto</translation>
@@ -1645,12 +1658,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../qualitydialog.ui" line="64"/>
<source>Quality slider</source>
- <translation type="unfinished"/>
+ <translation>Kvalitetsglidebryter</translation>
</message>
<message>
<location filename="../qualitydialog.ui" line="103"/>
<source>Automatic quality checkbox</source>
- <translation type="unfinished"/>
+ <translation>Automatisk kvalitet-avkryssningsboks</translation>
</message>
<message>
<location filename="../qualitydialog.ui" line="106"/>
@@ -1663,17 +1676,17 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="114"/>
<source>Validate Contact Request Button</source>
- <translation type="unfinished"/>
+ <translation>Verifiser kontaktforespørsel -knapp</translation>
</message>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="139"/>
<source>Mute contact request button</source>
- <translation type="unfinished"/>
+ <translation>Forespørsel om kontaktdemping -knapp</translation>
</message>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="161"/>
<source>Ban contact request button</source>
- <translation type="unfinished"/>
+ <translation>Forespørsel om kontaktbannlysning -knapp</translation>
</message>
</context>
<context>
@@ -1681,7 +1694,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../ringbutton.ui" line="140"/>
<source>Select folder</source>
- <translation type="unfinished"/>
+ <translation>Velg mappe</translation>
</message>
</context>
<context>
@@ -1699,7 +1712,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../sendcontactrequestwidget.ui" line="39"/>
<source>TODO: Explain the purpose of a contact request</source>
- <translation type="unfinished"/>
+ <translation>HUSKELISTE: Forklar meningen med en kontaktforespørsel</translation>
</message>
<message>
<location filename="../sendcontactrequestwidget.ui" line="78"/>
@@ -1717,12 +1730,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../videooverlay.ui" line="119"/>
<source>Hold / Unhold</source>
- <translation type="unfinished"/>
+ <translation>Parker / gjenoppta parkering</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="154"/>
<source>Chat</source>
- <translation>Melding</translation>
+ <translation>Sludre</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="186"/>
@@ -1737,12 +1750,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../videooverlay.ui" line="256"/>
<source>Mute Mic</source>
- <translation type="unfinished"/>
+ <translation>Demp mikrofon</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="338"/>
<source>Record call</source>
- <translation type="unfinished"/>
+ <translation>Ta opp samtale</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="370"/>
@@ -1752,12 +1765,12 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../videooverlay.ui" line="402"/>
<source>Join Calls</source>
- <translation type="unfinished"/>
+ <translation>Ta del i samtaler</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="476"/>
<source>Name label</source>
- <translation type="unfinished"/>
+ <translation>Navneetikett</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="498"/>
@@ -1777,7 +1790,7 @@ Kopier og del den med dine venner!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Oppsett</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1811,50 +1824,65 @@ Kopier og del den med dine venner!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
- <translation type="unfinished"/>
+ <translation>Kontoen din må flyttes. Skriv inn passordet ditt.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
- <translation type="unfinished"/>
+ <translation>Flytter din Ring-konto…</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Ukjent</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
+ <translation>Registrerer ditt offentlige brukernavn, det kan ta noen minutter…</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Legg til enhet</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Brukernavn ikke tilgjengelig.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Brukernavnet er tilgjengelig.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Ugyldig brukernavn.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Nettverksfeil.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1894,7 @@ Kopier og del den med dine venner!</translation>
<translation>Lenk denne enheten til en konto</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Hvordan legge til en enhet</translation>
</message>
@@ -1876,7 +1904,7 @@ Kopier og del den med dine venner!</translation>
<translation>Velkommen til</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1887,209 +1915,258 @@ p, li { white-space: pre-wrap; }
<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;">For å lenke denne enheten til en annen konto, må du først </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">skaffe en PIN-kode</span><span style=" font-family:'Ubuntu'; font-size:12pt;">For å generere denne PIN-koden:</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;">Go to the <span style=" font-weight:600;">Kontobehandlingsinnstilling</span> of a previous device</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;">Velg <span style=" font-weight:600;">Ring-kontoen</span> du ønsker å bruke</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;">Gå til <span style=" font-weight:600;">Enheter</span>-fanen</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;">Legg til enhet</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;">Du vil få den nødvendinge PIN-koden for å fullføre dette skjemaet. den er gyldig i </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutter</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Opprett din profil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Skriv inn hele navnet ditt:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Opprett din konto</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Velg ditt brukernavn</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Søker…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>Registrer brukernavnet ditt på Ring. Dette vil reservere brukernavnet ditt slik at du kan bruke det. Dine venner vil kunne ringe deg med ditt brukernavn istedenfor din RingID.</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="33"/>
<source>Wizard Dialog</source>
- <translation type="unfinished"/>
+ <translation>Velkomstdialog</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="36"/>
<source>Account creation wizard dialog</source>
- <translation type="unfinished"/>
+ <translation>Dialogvindu for kontoopprettelsesveiviser</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="72"/>
<source>Welcome Label</source>
- <translation type="unfinished"/>
+ <translation>Velkomstetikett</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="107"/>
<source>Welcome Logo</source>
- <translation type="unfinished"/>
+ <translation>Velkomstlogo</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="139"/>
<source>Create Ring account button</source>
- <translation type="unfinished"/>
+ <translation>Opprett Ring-konto -knapp</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="145"/>
<source>Push button for Ring account creation start trigger</source>
- <translation type="unfinished"/>
+ <translation>Trykknapp for start av Ring-kontoopprettelse -utløser</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="164"/>
<source>Link device button</source>
- <translation type="unfinished"/>
+ <translation>Lenk enhet -knapp</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="170"/>
<source>Push button for device linkage start trigger</source>
- <translation type="unfinished"/>
+ <translation>Trykknapp for start av enhetslinking -utløser</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
- <source>Photobooth Widget</source>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
- <source>Avatar display</source>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
- <source>Full name edit</source>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
- <source>Text entry for full name input</source>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
- <source>Public username checkbox</source>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
- <source>Checkbox selecting if the user wants a public username</source>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
- <source>Register public username (experimental)</source>
- <translation>Registrer offentlig brukernavn (eksperimentelt)</translation>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
- <source>Public username edit</source>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
- <source>Public username validation status</source>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
+ <location filename="../wizarddialog.ui" line="482"/>
+ <source>Photobooth Widget</source>
+ <translation>Fotoboks-miniprogram</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="509"/>
+ <source>Avatar display</source>
+ <translation>Avatarvisning</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="588"/>
+ <source>Full name edit</source>
+ <translation>Redigering av fullt navn</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="594"/>
+ <source>Text entry for full name input</source>
+ <translation>Tekstoppføring for fullt navn -inndata</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="673"/>
+ <source>Public username checkbox</source>
+ <translation>Offentlig brukernavn -avkryssningsboks</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="676"/>
+ <source>Checkbox selecting if the user wants a public username</source>
+ <translation>Avkryssningsboks som velger hvorvidt en bruker ønsker et offentlig brukernavn</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="679"/>
+ <source>Register public username (experimental)</source>
+ <translation>Registrer offentlig brukernavn (eksperimentelt)</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="724"/>
+ <source>Public username edit</source>
+ <translation>Redigering av offentlig brukernavn</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="746"/>
+ <source>Public username validation status</source>
+ <translation>Verifiseringsstatus for offentlig brukernavn</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
- <translation type="unfinished"/>
+ <translation>PIN-redigering</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
- <translation type="unfinished"/>
+ <translation>Enhetslenking for PIN-tekst -oppføring</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Skriv inn din PIN</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
- <translation type="unfinished"/>
+ <translation>Passordstekstinndata</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
- <translation type="unfinished"/>
+ <translation>Passordteksinnskriving</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Passord</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
- <translation type="unfinished"/>
+ <translation>Passordsbekreftelsestekst-inndata</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Bekreft passord</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
- <translation>Lager din Ring-konto...</translation>
+ <translation>Oppretter din Ring-konto…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
- <translation type="unfinished"/>
+ <translation>Forrige side -knapp</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
- <translation type="unfinished"/>
+ <translation>trykkbar knapp for å nå forrige side av veivisning</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Forrige</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
- <translation type="unfinished"/>
+ <translation>Neste side -knapp</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
- <translation type="unfinished"/>
+ <translation>Trykk på knappen for å komme til neste side i veivisningen</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Neste</translation>
</message>
diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts
index 2e0405a..f20501b 100644
--- a/translations/ring_client_windows_nl.ts
+++ b/translations/ring_client_windows_nl.ts
@@ -89,14 +89,14 @@ Ring is software voor beveiligde en gedistribueerde communicatie.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Gebruikersnaam</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Wachtwoord</translation>
</message>
@@ -121,17 +121,17 @@ Ring is software voor beveiligde en gedistribueerde communicatie.</translation>
<translation>UPnP ingeschakeld</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Oproep van onbekende aanvaarden</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Oproep van contact aanvaarden</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Oproepen van gebruikers in oproepgeschiedenis aanvaarden</translation>
</message>
@@ -172,12 +172,12 @@ Ring is software voor beveiligde en gedistribueerde communicatie.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Registreren op blokketen</translation>
</message>
@@ -222,448 +222,514 @@ Ring is software voor beveiligde en gedistribueerde communicatie.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ring-accountinstellingen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Beltoonselectie</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Afspelen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Audiocodecs</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Videocodecs</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Geavanceerd</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registratie</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Tijdslimiet voor registratieverval (seconden):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Netwerkinterface</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Lokale poort:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Gelijk aan lokale parameters</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Stel gepubliceerd adres en poort in:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adres</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Poort</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>STUN gebruiken</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Server-URL</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>TURN gebruiken</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Realm</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP-sessieonderhandeling (ICE-terugvaloptie)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Deze instellingen worden enkel gebruikt tijdens SDP-sessieonderhandelingen ingeval ICE niet ondersteund wordt door de server of de gebruiker.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Audio RTP-poortenreeks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Max</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Video RTP-poortenreeks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Beveiliging</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Mediastreamversleuteling (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Apparaten</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Apparaat toevoegen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Om een nieuw apparaat aan je Ring-account toe te voegen, moet je je account exporteren naar de Ring. Dit zal een pincode genereren die je binnen de 5 minuten op je nieuwe apparaat moet invoeren.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Wachtwoord (vereist)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Exporteren naar de Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Je gegenereerde pincode:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>Pincode</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>Je dient deze pincode op je nieuwe apparaat binnen de 5 minuten in te voeren. Je kan op elk moment een nieuwe code genereren.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>Oké</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Geblokkeerde contacten</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Gepubliceerd adres</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA-certificaat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Gebruikerscertificaat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Geheime sleutel</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Wachtwoord geheime sleutel</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Standaardcodering gebruiken</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pauze</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>Ring-ID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Kies bestand</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Bestanden (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Je pincode wordt gegenereerd, even geduld.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Netwerkfout, probeer het later opnieuw.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Verkeerd wachtwoord.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Bezig met registreren… Dit kan even duren</translation>
</message>
@@ -992,7 +1058,7 @@ Deel hem met je vrienden!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Deel hem met je vrienden!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Accounts</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Deel hem met je vrienden!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importeren</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Exporteren</translation>
</message>
@@ -1236,25 +1292,20 @@ Deel hem met je vrienden!</translation>
<translation>Ring automatisch starten</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Account aanmaken</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Weet je zeker dat je de geschiedenis wil wissen?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Map kiezen</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Er is een fout opgetreden tijdens het importeren van de account.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Deel hem met je vrienden!</translation>
<translation>Over</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Pad</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Wachtwoord</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Oké</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Annuleren</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Bestand opslaan</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring-archiefbestanden (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Bestand openen</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Deel hem met je vrienden!</translation>
<translation>Geen standaard-e-mailprogramma gevonden</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring-account</translation>
@@ -1778,7 +1790,7 @@ Deel hem met je vrienden!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Configuratie</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Deel hem met je vrienden!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>Je account moet worden gemigreerd. Voer je wachtwoord in.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Je Ring-account wordt gemigreerd...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Onbekend</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Je publieke gebruikersnaam wordt geregistreerd, dit kan enkele minuten duren...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Een apparaat toevoegen</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Gebruikersnaam is niet beschikbaar.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Gebruikersnaam is beschikbaar.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Gebruikersnaam is ongeldig.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Netwerkfout.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Deel hem met je vrienden!</translation>
<translation>Dit apparaat aan een account koppelen</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Hoe voeg ik een apparaat toe</translation>
</message>
@@ -1877,7 +1904,7 @@ Deel hem met je vrienden!</translation>
<translation>Welkom bij</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1900,34 +1927,34 @@ p, li { white-space: pre-wrap; }
<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;">Je zal de pincode krijgen die je nodig hebt om dit proces te voltooien. De pincode is slechts </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minuten</span> <span style=" font-family:'Ubuntu'; font-size:12pt;">geldig.</span></p></body></html></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Maak je profiel aan</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Voer je volledige naam in:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Maak je account aan</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Kies je gebruikersnaam</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Zoeken...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>Registreer je gebruikersnaam op de Ring, zodat enkel jij ze kan gebruiken. Je vrienden zullen je kunnen bellen met je gebruikersnaam ipv je Ring-ID.</translation>
</message>
@@ -1972,134 +1999,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Registreer een publieke gebruikersnaam (experimenteel)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Voer je pincode in</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Wachtwoord</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Bevestig wachtwoord</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Je Ring-account wordt aangemaakt...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Vorige</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Volgende</translation>
</message>
diff --git a/translations/ring_client_windows_nl_NL.ts b/translations/ring_client_windows_nl_NL.ts
index d0d57cd..ba07f68 100644
--- a/translations/ring_client_windows_nl_NL.ts
+++ b/translations/ring_client_windows_nl_NL.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Gebruikersnaam</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Wachtwoord</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Spelen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Gevorderd</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Beveiliging</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -1000,7 +1066,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Accounts</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1209,22 +1275,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"/>
</message>
@@ -1234,25 +1290,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1535,45 +1586,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Wachtwoord</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1633,7 +1645,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1810,50 +1822,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1865,7 +1892,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1875,7 +1902,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1889,34 +1916,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1961,134 +1988,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Wachtwoord</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts
index 461eee2..3efc605 100644
--- a/translations/ring_client_windows_pa.ts
+++ b/translations/ring_client_windows_pa.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation type="unfinished"/>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -1209,22 +1275,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"/>
</message>
@@ -1234,25 +1290,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1535,45 +1586,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1633,7 +1645,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1810,50 +1822,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1865,7 +1892,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1875,7 +1902,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1889,34 +1916,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1961,134 +1988,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts
index 8ff6e5b..06cb7a3 100644
--- a/translations/ring_client_windows_pl.ts
+++ b/translations/ring_client_windows_pl.ts
@@ -89,14 +89,14 @@ Ring jest strzeżonym i rozdzielonym programem komunikacyjnym.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Nazwa użytkownika</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Hasło</translation>
</message>
@@ -121,17 +121,17 @@ Ring jest strzeżonym i rozdzielonym programem komunikacyjnym.</translation>
<translation>UPnP jest włączone</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Zezwól Na Połączenia Od Nieznanych</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Zezwól Na Połączenia Od Kontaku</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Zezwól Na Połączenia Od Historii</translation>
</message>
@@ -172,12 +172,12 @@ Ring jest strzeżonym i rozdzielonym programem komunikacyjnym.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring jest strzeżonym i rozdzielonym programem komunikacyjnym.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ustawienia Konta Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Wybierz Dzwonek</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Graj</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Kodeki audio</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Kodeki wideo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Zaawansowane</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Rejestracja</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Limit czasu do rejestracji (w sekundach) :</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Interfejs Sieciowy</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Port lokalny:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Tak samo jak lokalne parametry.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Ustaw opublikowany adres i port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adres</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Użyj STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>serwer URL</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Użyj TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>sfera</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Negocjacja sesji SDP (użyjcie ICE w przypadku awari)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Te ustawienia są tylko używane podczas negocjacji sesji SDP w przypadku gdzie ICE nie jest obsługiwany przez serwer lub innym użytkownikiem.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Zakres Portów Audio RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Max</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Zakres Portów Wideo RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Zabezpieczenia</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Szyfrowanie Strumieni Multimedialnych (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Urządzenia</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Opublikowany Adres</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Certyfikat CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Certyfikat użytkownika</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Klucz prywatny</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Hasło klucza prywatnego</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Użyj domyślnych szyfrów</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pauza</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Wybierz Plik</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Pliki (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Błędne hasło.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -991,7 +1057,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Wideo</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1001,7 +1067,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Konta</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importuj</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Wyeksportuj</translation>
</message>
@@ -1235,25 +1291,20 @@ Copy and share it with your friends!</source>
<translation>Uruchom Ring przy Starcie</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nowe konto</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Czy na pewno chcesz usunąć całą twoją historię?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Wybierz Folder</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Wystąpił błąd podczas importowania konta.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Copy and share it with your friends!</source>
<translation>O</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Ścieżka</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Hasło</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Ok</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Anuluj</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Zapisz plik</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Pliki archchiwum Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Otwórz plik</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Copy and share it with your friends!</source>
<translation>Nie znaleziono domyślnego klienta poczty</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>konto Ring</translation>
@@ -1777,7 +1789,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Konfiguracja</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1811,50 +1823,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Nieznane</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Copy and share it with your friends!</source>
<translation>Połącz to urządzenie z kontem</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Stwórz swój profil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Stwórz konto</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Wybierz swoją nazwę użytkownika</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Zarejestruj publiczną nazwę użytkownika (eksperymentalne)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Hasło</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Potwierdź hasło</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Generowanie twojego konta Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Następne</translation>
</message>
diff --git a/translations/ring_client_windows_pl_PL.ts b/translations/ring_client_windows_pl_PL.ts
index 48d0f17..7436446 100644
--- a/translations/ring_client_windows_pl_PL.ts
+++ b/translations/ring_client_windows_pl_PL.ts
@@ -1,57 +1,59 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="pl_PL">
<context>
<name>AboutDialog</name>
<message>
<location filename="../aboutdialog.ui" line="435"/>
<location filename="../aboutdialog.ui" line="465"/>
<source>About</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="462"/>
<source>about button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="478"/>
<source>credits button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="481"/>
<source>Credits</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message utf8="true">
<location filename="../aboutdialog.ui" line="547"/>
<source>Liberté, Égalité, Fraternité - Version 1.0</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="563"/>
<source>The Microsoft Windows client for Ring.
Ring is a secured and distributed communication software.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="30"/>
<source>version</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="37"/>
<source>Created by:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="71"/>
<source>Artwork by:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutdialog.cpp" line="75"/>
<source>Based on the SFLPhone project</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -59,612 +61,678 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../accountdetails.ui" line="23"/>
<source>Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="66"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="143"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="206"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="250"/>
<source>Parameters</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="280"/>
<source>Hostname</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="515"/>
<source>Proxy</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="558"/>
<source>Voicemail number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="598"/>
<source>Auto-answer calls</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="619"/>
<source>UPnP enabled</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="69"/>
<source>General account info configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="169"/>
<source>Displayed name</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="191"/>
<source>Displayed alias input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="302"/>
<source>Hostname URL for DHT bootstrap or SIP</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="323"/>
<source>Public username</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="350"/>
<source>Ring public registered username</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="369"/>
<source>Register username on blockchain button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="389"/>
<source>Name service URL</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="411"/>
<source>Nameservice URL input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="448"/>
<source>SIP username input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="491"/>
<source>SIP password input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="537"/>
<source>SIP proxy URL input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="580"/>
<source>SIP voicemail number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="592"/>
<source>Autoanswer call checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../accountdetails.ui" line="613"/>
<source>UPnP enabled checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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 type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -672,27 +740,27 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../bannedcontactswidget.ui" line="20"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="41"/>
<source>Banned contacts list</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="69"/>
<source>Banned ID</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="101"/>
<source>Deban contact button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="104"/>
<source>Deban contact, and add to contact list</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -700,27 +768,27 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../callutilsdialog.ui" line="53"/>
<source>existing contacts list</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="68"/>
<source>contact transfer number text entry</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="71"/>
<source>or type number...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="110"/>
<source>Transfer call button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="113"/>
<source>Transfer</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -728,161 +796,161 @@ Ring is a secured and distributed communication software.</source>
<message>
<location filename="../callwidget.ui" line="216"/>
<source>Search contacts or enter ring ID</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="333"/>
<source>Conversations</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="384"/>
<source>Contact requests</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="642"/>
<source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="207"/>
<source>Search contact text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="248"/>
<source>search button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="557"/>
<source>Configuration menu</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="680"/>
<source>This is your RingID.
Copy and share it with your friends!</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="791"/>
<source>Show ring ID QR code</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="842"/>
<source>Share ring ID button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="900"/>
<source>Double-click to copy</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="935"/>
<source>Error while generating QR Code</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="979"/>
<location filename="../callwidget.ui" line="1069"/>
<location filename="../callwidget.ui" line="1840"/>
<source>Back to homepage button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1189"/>
<source>Peer contact method selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1208"/>
<location filename="../callwidget.cpp" line="327"/>
<source>Add to contacts</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1237"/>
<source>Start the conversation !</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1314"/>
<source>Type your message here</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1333"/>
<source>send message</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1459"/>
<source>BestId</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1469"/>
<source>Wants to talk to you!</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1498"/>
<source>Answer incoming call button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1543"/>
<source>Ignore incoming call button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1570"/>
<source>Answer</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1602"/>
<source>Ignore</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1673"/>
<source>Calling</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1726"/>
<source>Cancel outgoing call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1749"/>
<source>Cancel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.ui" line="1449"/>
<source>Call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="295"/>
<source>Copy number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="959"/>
<source>Contact me on Ring</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="959"/>
<source>My RingId is : </source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="214"/>
@@ -892,69 +960,69 @@ Copy and share it with your friends!</source>
<message>
<location filename="../callwidget.cpp" line="227"/>
<source>Display date</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="232"/>
<source>Display author</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="263"/>
<source>Message incoming from %1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="301"/>
<source>Copy name</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="307"/>
<source>Call Number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="308"/>
<source>Copy Number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="311"/>
<source>Copy %1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="316"/>
<source>Call %1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="338"/>
<source>Remove from contacts</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="762"/>
<source>NO RING ACCOUNT FOUND</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="807"/>
<source>%1</source>
<comment>%1 is the contact username</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="812"/>
<source>%1</source>
<comment>%1 is the contact unique identifier</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../callwidget.cpp" line="445"/>
<source>Call incoming from %1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -962,7 +1030,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../combar.ui" line="72"/>
<source>Call button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -970,288 +1038,273 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="20"/>
<source>Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="97"/>
<source>General configuration tab</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="103"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="119"/>
<source>Audio / Video configuration tab</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
<source>Accounts configuration tab</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
<source>quit settings menu</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="346"/>
<source>History Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="387"/>
<source>Keep History for (days)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="433"/>
<source>(Set to 0 for unlimited history)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="490"/>
<source>Clear History</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="642"/>
<source>Misc. Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="667"/>
<source>Keep minimized on close</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="820"/>
<source>Check for updates now</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="258"/>
<source>Profile</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="288"/>
<source>Avatar (click to change)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="311"/>
<source>Display name text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="314"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="400"/>
<source>Number of days of history kept</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="484"/>
<source>clear history button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="527"/>
<source>Record Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="560"/>
<source>Save in :</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="573"/>
<source>Call records path</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="603"/>
<source>Always record calls checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="609"/>
<source>Always Record</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="661"/>
<source>keep minimized on close checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="679"/>
<source>enable notifications checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="685"/>
<source>Enable notifications</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="703"/>
<source>Launch ring on startup checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="732"/>
<source>Autamatic update checks checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="738"/>
<source>Check for update automatically every</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="757"/>
<source>Interval between update checks in days selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="778"/>
<source>days</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="817"/>
<source>Check for updates now button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="933"/>
<source>Preview unavailable during call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="987"/>
<source>Device Selection</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1042"/>
<location filename="../configurationwidget.ui" line="1061"/>
<source>Video device selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1048"/>
<source>Device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1082"/>
<source>Resolution</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1095"/>
<source>Video device resolution selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1122"/>
<source>Output Device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1129"/>
<source>Audio output device selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1141"/>
<source>Input Device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1148"/>
<source>Audio input device selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1226"/>
<source>New account type selector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1245"/>
<source>add new account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1283"/>
<source>Delete account button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="712"/>
<source>Launch Ring on Startup</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1259,57 +1312,57 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactpicker.ui" line="33"/>
<source>Existing Contact</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="43"/>
<source>search existing contact text entry</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="46"/>
<source>Search...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="56"/>
<source>existing contacts list</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="63"/>
<source>Create new contact button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="66"/>
<source>Create new contact</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="85"/>
<source>New Contact</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="108"/>
<source>New contact name text entry</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="111"/>
<source>Enter a name here...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="141"/>
<source>Validate contact creation button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactpicker.ui" line="144"/>
<source>Create</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1317,52 +1370,52 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactrequestwidget.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="28"/>
<source>Incoming Contact Request</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="87"/>
<source>nameLabel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="103"/>
<source>bestIdLabel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="125"/>
<source>Accept contact request button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="132"/>
<source>Accept</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="151"/>
<source>Mute contact request</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="158"/>
<source>Discard</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="177"/>
<source>Ban contact request</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="184"/>
<source>Block</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1370,22 +1423,22 @@ Copy and share it with your friends!</source>
<message>
<location filename="../currentaccountwidget.ui" line="26"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../currentaccountwidget.ui" line="97"/>
<source>Account avatar</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../currentaccountwidget.ui" line="128"/>
<source>Account status</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../currentaccountwidget.ui" line="141"/>
<source>account selection combobox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1393,42 +1446,42 @@ Copy and share it with your friends!</source>
<message>
<location filename="../deleteaccountdialog.ui" line="14"/>
<source>Ring - account deletion</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="33"/>
<source>Do you really want to delete account ?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="66"/>
<source>This action is irrevocable</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</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"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="138"/>
<source>Cancel contact deletion button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="141"/>
<source>Cancel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="167"/>
<source>Validate contact deletion button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="170"/>
<source>Ok</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1436,27 +1489,27 @@ Copy and share it with your friends!</source>
<message>
<location filename="../deletecontactdialog.ui" line="20"/>
<source>Dialog</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="47"/>
<source>Do you want to delete this contact?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="123"/>
<source>Cancel contact deletion button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="126"/>
<source>Cancel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="139"/>
<source>Delete contact validation button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="142"/>
@@ -1466,12 +1519,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../deletecontactdialog.ui" line="155"/>
<source>Delete and ban validation button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="158"/>
<source>Delete and ban</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1479,22 +1532,22 @@ Copy and share it with your friends!</source>
<message>
<location filename="../instantmessagingwidget.ui" line="38"/>
<source>Message list</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.ui" line="74"/>
<source>Message input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.ui" line="77"/>
<source>Send text message...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.ui" line="99"/>
<source>Send message button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.cpp" line="44"/>
@@ -1504,12 +1557,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../instantmessagingwidget.cpp" line="50"/>
<source>Display date</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../instantmessagingwidget.cpp" line="54"/>
<source>Display author</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1522,56 +1575,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../mainwindow.cpp" line="59"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="62"/>
<source>Exit</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="81"/>
<source>About</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1579,7 +1593,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../photoboothdialog.ui" line="14"/>
<source>Photobooth</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1587,42 +1601,42 @@ Copy and share it with your friends!</source>
<message>
<location filename="../photoboothwidget.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="20"/>
<source>Photobooth display</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="51"/>
<source>Take photo</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="71"/>
<source>or</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="84"/>
<source>Import photo</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="87"/>
<source>Import</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.cpp" line="66"/>
<source>Choose File</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../photoboothwidget.cpp" line="68"/>
<source>Files (*)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1630,13 +1644,13 @@ Copy and share it with your friends!</source>
<message>
<location filename="../utils.cpp" line="187"/>
<source>No default mail client found</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1644,17 +1658,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../qualitydialog.ui" line="64"/>
<source>Quality slider</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qualitydialog.ui" line="103"/>
<source>Automatic quality checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qualitydialog.ui" line="106"/>
<source>Auto</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1662,17 +1676,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="114"/>
<source>Validate Contact Request Button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="139"/>
<source>Mute contact request button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="161"/>
<source>Ban contact request button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1680,7 +1694,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../ringbutton.ui" line="140"/>
<source>Select folder</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1688,22 +1702,22 @@ Copy and share it with your friends!</source>
<message>
<location filename="../sendcontactrequestwidget.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sendcontactrequestwidget.ui" line="26"/>
<source>ContactID</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sendcontactrequestwidget.ui" line="39"/>
<source>TODO: Explain the purpose of a contact request</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sendcontactrequestwidget.ui" line="78"/>
<source>Send contact request</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1711,82 +1725,82 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="42"/>
<source>Call on Hold</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="119"/>
<source>Hold / Unhold</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="154"/>
<source>Chat</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="186"/>
<source>Add person to call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="218"/>
<source>Transfer call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="256"/>
<source>Mute Mic</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="338"/>
<source>Record call</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="370"/>
<source>Quality</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="402"/>
<source>Join Calls</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="476"/>
<source>Name label</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="498"/>
<source>Add to contact</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="568"/>
<source>Time elapsed</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="571"/>
<source>00:00</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
<source>Hangup</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videooverlay.ui" line="297"/>
<source>Mute Video</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1794,303 +1808,358 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videoview.cpp" line="235"/>
<source>Share entire screen</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videoview.cpp" line="238"/>
<source>Share screen area</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../videoview.cpp" line="245"/>
<source>Share file</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation type="unfinished"/>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="173"/>
<source>Link this device to an account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="78"/>
<source> Welcome to</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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:'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;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; 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-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;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</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;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</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;">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>
+</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;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; 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-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;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</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;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</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;">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 type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="33"/>
<source>Wizard Dialog</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="36"/>
<source>Account creation wizard dialog</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="72"/>
<source>Welcome Label</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="107"/>
<source>Welcome Logo</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="139"/>
<source>Create Ring account button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="145"/>
<source>Push button for Ring account creation start trigger</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="164"/>
<source>Link device button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="170"/>
<source>Push button for device linkage start trigger</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts
index f66df3f..b882bae 100644
--- a/translations/ring_client_windows_pt.ts
+++ b/translations/ring_client_windows_pt.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Usuário</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Senha</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP habilitado</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avançado</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>A sessão expira em (segundos):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Igual aos parâmetros locais</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Defina endereço e porta:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Endereço</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Porta</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Usar STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Usar TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Estas configurações serão usadas durante o estabelecimento de sessão via SDP, caso as configurações de roteamento não permitam acesso ao servidor ou a um peer</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Max</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Segurança</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Certificado CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Certificado do usuário</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Chave privada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Senha da chave privada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Use cifras padrão</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -1001,7 +1067,7 @@ Copie e avise seus amigos!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Contas</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copie e avise seus amigos!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"/>
</message>
@@ -1235,25 +1291,20 @@ Copie e avise seus amigos!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nova Conta</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Copie e avise seus amigos!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Senha</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Copie e avise seus amigos!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1811,50 +1823,65 @@ Copie e avise seus amigos!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Desconhecido</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Copie e avise seus amigos!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Copie e avise seus amigos!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Senha</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Gerando sua conta Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Próximo</translation>
</message>
diff --git a/translations/ring_client_windows_pt_BR.ts b/translations/ring_client_windows_pt_BR.ts
index cbae27e..3cbf624 100644
--- a/translations/ring_client_windows_pt_BR.ts
+++ b/translations/ring_client_windows_pt_BR.ts
@@ -10,12 +10,12 @@
<message>
<location filename="../aboutdialog.ui" line="462"/>
<source>about button</source>
- <translation type="unfinished"/>
+ <translation>botão sobre</translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="478"/>
<source>credits button</source>
- <translation type="unfinished"/>
+ <translation>botão créditos</translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="481"/>
@@ -89,14 +89,14 @@ Ring é um software de comunicação distribuído e seguro.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Nome de usuário</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Senha</translation>
</message>
@@ -121,39 +121,39 @@ Ring é um software de comunicação distribuído e seguro.</translation>
<translation>UPnP ativado</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Aceitar Chamada de Desconhecido</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Aceitar Chamada de Contato</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Aceitar Chamada de Histórico</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="69"/>
<source>General account info configuration</source>
- <translation type="unfinished"/>
+ <translation>Configuração das informações gerais da conta</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="169"/>
<source>Displayed name</source>
- <translation type="unfinished"/>
+ <translation>Nome em exibição</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="191"/>
<source>Displayed alias input</source>
- <translation type="unfinished"/>
+ <translation>Entrada de pseudônimo em exibição</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="302"/>
<source>Hostname URL for DHT bootstrap or SIP</source>
- <translation type="unfinished"/>
+ <translation>Endereço hostname para SIP ou DHT</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="323"/>
@@ -163,21 +163,21 @@ Ring é um software de comunicação distribuído e seguro.</translation>
<message>
<location filename="../accountdetails.ui" line="350"/>
<source>Ring public registered username</source>
- <translation type="unfinished"/>
+ <translation>Usuário publico registrado no Ring</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="369"/>
<source>Register username on blockchain button</source>
- <translation type="unfinished"/>
+ <translation>Usuário registrado no botão do blockchain</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Registrar no blockchain</translation>
</message>
@@ -189,481 +189,547 @@ Ring é um software de comunicação distribuído e seguro.</translation>
<message>
<location filename="../accountdetails.ui" line="411"/>
<source>Nameservice URL input</source>
- <translation type="unfinished"/>
+ <translation>Entrada de URL do serviço de nomes</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="448"/>
<source>SIP username input</source>
- <translation type="unfinished"/>
+ <translation>Entrada de usuário SIP</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="491"/>
<source>SIP password input</source>
- <translation type="unfinished"/>
+ <translation>Entrada de senha SIP</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="537"/>
<source>SIP proxy URL input</source>
- <translation type="unfinished"/>
+ <translation>Entrada de URL do proxy SIP</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="580"/>
<source>SIP voicemail number</source>
- <translation type="unfinished"/>
+ <translation>Número de mensagem de voz SIP</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="592"/>
<source>Autoanswer call checkbox</source>
- <translation type="unfinished"/>
+ <translation>Checkbox do atendimento automático de ligação</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="613"/>
<source>UPnP enabled checkbox</source>
+ <translation>Checkbox de ativação UPnP</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Configurações de Conta do Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Selecionar toque</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Reproduzir</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Áudio/Vídeo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Codecs de Áudio</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Codecs de Vídeo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avançado</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registro</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Tempo de expiração de registro (segundos):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Interface de Rede</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Porta Local:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Igual aos parâmetros locais</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Configurar endereço e portas publicadas:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Endereço</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Porta</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Usar STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL do servidor</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Usar TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Domínio</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Negociação de sessão SDP ( ICE Fallback)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Estas configurações serão apenas utilizadas durante uma negociação de sessão SDP, caso ICE não seja suportado pelo servidor ou membro.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Variação de portas de audio RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Máx</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Intervalo de portas de Video RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Segurança</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Criptografia de Fluxo de Mídia (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Dispositivos</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Adicionar dispositivo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Para adicionar um novo dispositivo à sua conta Ring, você deve exportar sua conta no Ring. Isso gerará um PIN que deve ser entrado em seu novo dispositivo dentro de 5 minutos desde a sua geração.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Senha (necessária)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Exportar no Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Seu PIN gerado:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>Este PIN deve ser inserido no seu novo dispositivo nos próximos 5 minutos. Você pode ter que gerar um novo a qualquer momento.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Contatos Banidos</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Endereço publicado</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Certificado de CA</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Certificado de usuário</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Chave Privada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Senha de chave privada</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Utilizar cifras padrão</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pausar</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Escolher Arquivo</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Arquivos (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Por favor aguarde enquanto seu PIN é gerado.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Erro de Rede. Por favor tente novamente mais tarde.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Senha Incorreta.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Registrando... Isto pode tomar algum tempo</translation>
</message>
@@ -992,7 +1058,7 @@ Salve e compartilhe com seus amigos!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Áudio/Vídeo</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Salve e compartilhe com seus amigos!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Contas</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Salve e compartilhe com seus amigos!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importar</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Exportar</translation>
</message>
@@ -1236,25 +1292,20 @@ Salve e compartilhe com seus amigos!</translation>
<translation>Iniciar ao ligar o Ring</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nova conta</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Você tem certeza que deseja limpar todo o seu histórico?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Escolher diretório</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Ocorreu um erro ao importar a conta.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Salve e compartilhe com seus amigos!</translation>
<translation>Sobre</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Caminho</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Senha</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Ok</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Salvar arquivo</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Arquivos Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Abrir arquivo</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Salve e compartilhe com seus amigos!</translation>
<translation>Cliente de e-mail não encontrado</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Conta Ring</translation>
@@ -1778,7 +1790,7 @@ Salve e compartilhe com seus amigos!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Configuração</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Salve e compartilhe com seus amigos!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>Sua conta precisa ser migrada. Entre com sua senha.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Migrando sua conta do Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Desconhecido</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Registrando seu usuário público, isto pode tomar alguns minutos...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Adicionar dispositivo</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Usuário não disponível.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Usuário disponível.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Usuário é inválido.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Erro na Rede.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Salve e compartilhe com seus amigos!</translation>
<translation>Associar este dispositivo a uma conta</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Como adicionar um dispositivo</translation>
</message>
@@ -1877,7 +1904,7 @@ Salve e compartilhe com seus amigos!</translation>
<translation>Bem vindo ao</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1900,34 +1927,34 @@ p, li { white-space: pre-wrap; }
<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;">Você irá receber o PIN necessário para completar este formulário. Este PIN só será válido por </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutos</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Criar um Perfil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Digite seu nome completo:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Criar uma conta</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Escolha seu nome de usuário</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Buscando...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>Registre seu usuário no Ring. Isto irá reservar o usuário para que apenas você possa o utilizar. Seus amigos serão capazes de chama-lo com seu usuário ao invés de com seu RingID</translation>
</message>
@@ -1972,134 +1999,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Registrar usuário público (experimental)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Entre o seu pin</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
- <translation type="unfinished"/>
+ <translation>Campo de texto da Senha</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Senha</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
- <translation type="unfinished"/>
+ <translation>Campo de texto para confirmação da Senha</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Confirmar senha</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Criando sua conta Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
- <translation type="unfinished"/>
+ <translation>Botão da página anterior</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
- <translation type="unfinished"/>
+ <translation>Pressione botão para acessar a página anterior do assistente</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Anterior</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
- <translation type="unfinished"/>
+ <translation>Botão da próxima página</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
- <translation type="unfinished"/>
+ <translation>Pressione botão para acessar próxima página do assistente</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Próximo</translation>
</message>
diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts
index edda262..f975b36 100644
--- a/translations/ring_client_windows_ro.ts
+++ b/translations/ring_client_windows_ro.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Nume de utilizator</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Parola</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Redare</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avansat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Seuritate</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -1000,7 +1066,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Conturi</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1209,22 +1275,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"/>
</message>
@@ -1234,25 +1290,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1535,45 +1586,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Parola</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1633,7 +1645,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1810,50 +1822,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Necunoscut</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1865,7 +1892,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1875,7 +1902,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1889,34 +1916,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1961,134 +1988,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Parola</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Confirmă parola</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index a1f11e9..1b924a7 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -89,14 +89,14 @@ Ring – это приложение для безопасного и распр
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Имя пользователя</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
@@ -121,17 +121,17 @@ Ring – это приложение для безопасного и распр
<translation>UPnP разрешен</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Разрешать звонки от незнакомых</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Разрешать звонки от лиц из списка контактов</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Разрешать звонки от лиц из истории</translation>
</message>
@@ -172,12 +172,12 @@ Ring – это приложение для безопасного и распр
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Зарегистрировать в блокчейн</translation>
</message>
@@ -222,448 +222,514 @@ Ring – это приложение для безопасного и распр
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Настройки аккаунта Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Выбор мелодии звонка</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Играть</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Звук/Видео</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Аудио кодеки</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Видео кодеки</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Дополнительно</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Регистрация</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Регистрация истекает через (секунды):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Сетевой интерфейс</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Локальный порт:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Такие же, как и локальные параметры</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Установить публикуемый адрес и порт:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Адрес</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Порт</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Исполльзовать STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Адрес сервера</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Использовать TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Область </translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Согласование сесcии SDP (резерв ICE)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Данные параметры используются только во время SDP согласования сессии в случае, если ICE не поддерживается сервером или пиром.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Диапазон портов для RTP аудио</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Минимум</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Максимум</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Диапазон портов для RTP видео</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Безопасность</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Шифрование медиапотока (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Устройства</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Добавить устройство</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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 минут с момента его генерации.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Пароль (обязательно)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Экспорт в сеть Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Ваш сгенерированный PIN:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>Этот PIN должен быть введен на новом устройстве в течение 5 минут. Вы можете сгенерировать новый в любой момент.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>ОК</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Заблокированные контакты</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Публикуемый адрес</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Сертификат удостоверяющего центра</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Пользовательский сертификат</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Закрытый ключ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Пароль к закрытому ключу</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Использовать шифрование по-умолчанию</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Выберите файл</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Файлы (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Пожалуйста, подождите, пока генерируется ваш PIN.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Ошибка сети. Пожалуйста, повторите попытку позднее.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Неверный пароль.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Регистрация… Это может занять некоторое время</translation>
</message>
@@ -992,7 +1058,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Аудио/Видео</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Аккаунты</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Импорт</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Экспорт</translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation>Запускать Ring при старте системы</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Новый аккаунт</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Вы уверены, что хотите удалить всю историю? </translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Выбрать папку</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Во время импортирования аккаунта произошла ошибка.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation>О программе</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Путь</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Пароль</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Ok</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Отмена</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Сохранить файл</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Файлы архива Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Открыть файл</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation>Не найден почтовый клиент по умолчанию</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Аккаунт Ring</translation>
@@ -1778,7 +1790,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Настройка</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>Ваша учетная запись должна быть перенесена. Введите ваш пароль.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Переносим ваш аккаунт Ring…</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Неизвестно</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Регистрируем ваше публичное имя пользователя, это может занять несколько минут…</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Добавить устройство</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Имя пользователя недоступно.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Имя пользователя доступно.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Недопустимое имя пользователя.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Ошибка сети.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation>Привязать это устройство к аккаунту</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Как добавить устройство</translation>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation>Добро пожаловать в</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1900,34 +1927,34 @@ p, li { white-space: pre-wrap; }
<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="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Создайте свой профиль</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Введите ваше полное имя:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Создайте свой аккаунт</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Выберите ваше имя пользователя</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Поиск…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1972,134 +1999,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Зарегистрировать публичное имя (экспериментальная функция)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Введите ваш PIN</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Подтвердить пароль</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Создание вашего аккаунта Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Назад</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Далее</translation>
</message>
diff --git a/translations/ring_client_windows_ru_RU.ts b/translations/ring_client_windows_ru_RU.ts
index 45839cb..6f757ac 100644
--- a/translations/ring_client_windows_ru_RU.ts
+++ b/translations/ring_client_windows_ru_RU.ts
@@ -89,14 +89,14 @@ Ring защищенное и распределенное программное
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Пользователь</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
@@ -121,17 +121,17 @@ Ring защищенное и распределенное программное
<translation>UPnP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -172,12 +172,12 @@ Ring защищенное и распределенное программное
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring защищенное и распределенное программное
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Воспроизвести</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Аудио/видео</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Дополнительно</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Регистрация</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Время истечения регистрации в секундах:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Сетевой интерфейс</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Аналогично локальным параметрам</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Установить публичный адрес и порт:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Адрес</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Порт</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Использовать STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Использовать TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Область</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Диапазон портов RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Мин</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Макс</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Безопасность</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Публичный адрес</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA сертификат</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Сертификат пользователя</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Приватный ключ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Пароль приватного ключа</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Выбрать файл</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Файлы(*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -991,7 +1057,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Звук/Видео</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1001,7 +1067,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Учетные записи</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Импорт</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Экспорт</translation>
</message>
@@ -1235,25 +1291,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Новая учетная запись</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Вы уверены что хотите удалить история поиска?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Выбрать каталог</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>При импорте учетной записи произошла ошибка</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Copy and share it with your friends!</source>
<translation>О продукте</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Путь</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Пароль</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Да</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Отмена</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Сохранить файл</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Архивные файла Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Открыть файл</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Copy and share it with your friends!</source>
<translation>Не найден почтовый клиент используемый по умолчанию</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1777,7 +1789,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Настройка</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1811,50 +1823,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>Ваша учетная запись должна быть перенесена. Введите ваш пароль.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Неизвестно</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Выберите ваше имя пользователя</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Подтвердите пароль</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Создать вашу учетную запись Ring</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Далее</translation>
</message>
diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts
index 336e14e..b3e1a9c 100644
--- a/translations/ring_client_windows_sk_SK.ts
+++ b/translations/ring_client_windows_sk_SK.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation type="unfinished"/>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP zapnuté</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation type="unfinished"/>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Spusť</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registrácia</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Zariadenia</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Pridaj zariadenie</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Zruš</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Vyber súbor</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Súbory (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -990,7 +1056,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1000,7 +1066,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Nastavenie účtov</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1209,22 +1275,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"/>
</message>
@@ -1234,25 +1290,20 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1535,45 +1586,6 @@ Copy and share it with your friends!</source>
<translation>O programe</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Zruš</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1633,7 +1645,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1776,7 +1788,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Konfigurácia</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1810,50 +1822,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Neznámy</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1865,7 +1892,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1875,7 +1902,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1889,34 +1916,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1961,134 +1988,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Ďalej</translation>
</message>
diff --git a/translations/ring_client_windows_sl.ts b/translations/ring_client_windows_sl.ts
index 4be759b..a7d6c19 100644
--- a/translations/ring_client_windows_sl.ts
+++ b/translations/ring_client_windows_sl.ts
@@ -89,14 +89,14 @@ Ring je varen in necentraliziran način komunikacije.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Uporabnik</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Geslo</translation>
</message>
@@ -121,17 +121,17 @@ Ring je varen in necentraliziran način komunikacije.</translation>
<translation>UPnP omogočen</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Dovoli klice nepoznanih klicateljev</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Dovoli klice stika</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Dovoli klice iz zgodovine</translation>
</message>
@@ -172,12 +172,12 @@ Ring je varen in necentraliziran način komunikacije.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Prijava na 'blockchain'</translation>
</message>
@@ -222,448 +222,514 @@ Ring je varen in necentraliziran način komunikacije.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Nastavitve Ring računa</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Izbira zvonjenja</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Predvajaj</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Avdio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Avdio kodeki</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Video kodeki</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Napredno</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Prijava</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Časovna omejitev prijave (sek):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Mrežni vmesnik</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Lokalna vrata:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Isto kot lokalni parametri</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Nastavi objavljen naslov in vrata:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Naslov</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Vrata</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Uporabi STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL strežnika</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Uporabi TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Območje (realm)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Dogovarjanje seje SDP (ICE Fallback)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Te nastavitve so uporabljene samo ob dogovarjanju SDP seje v primeru, da ICE protokol ni podprt s strani strežnika ali vozla.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Omočje RTP vrat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Max</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Območje vrat za video RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Varnost</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Šifriranje pretoka vsebine (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Naprave</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Dodaj napravo</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>Za dodati novo napravo v tvoj Ring račun, moraš izvoziti tvoj račun na Ring. To bo ustvarilo PIN, ki ga moraš vnesti na novi napravi v roku 5 minut.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Geslo (zahtevano)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Izvozi v Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Tvoj ustvarjen PIN:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>Ta PIN moraš vnesti na tvoji novi napravi v roku 5 minut. Lahko ustvariš nov PIN kadarkoli.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Zavrnjeni stiki</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Objavi naslov</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA Certifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Osebni certifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Zasebni ključ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Geslo zasebnega ključa</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Uporabi privzete ćiperje</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pavza</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Izberi datoteko</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Datoteke (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Prosim počakaj, dokler PIN ni ustvarjen.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Napaka mreže. Prosim poskusi ponovno.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Napačno geslo.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Prijavljam... Lahko traj anekaj časa</translation>
</message>
@@ -1211,22 +1277,12 @@ Kopiraj in deli s svojimi prijatelji!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Uvoz</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Izvoz</translation>
</message>
@@ -1236,25 +1292,20 @@ Kopiraj in deli s svojimi prijatelji!</translation>
<translation>Zaženi Ring ob zagonu</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nov račun</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Ali resnično želiš počistiti vso zgodovino?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Izberi mapo</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Zgodila se je napaka med uvozom računa.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Kopiraj in deli s svojimi prijatelji!</translation>
<translation>O Ring</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Pot</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Geslo</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>V redu</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Prekliči</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Shrani datoteko</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring arhivska datoteka (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Odpri datoteko</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Kopiraj in deli s svojimi prijatelji!</translation>
<translation>Ne najdem privzetega programa za e-pošto</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring račun</translation>
@@ -1812,50 +1824,65 @@ Kopiraj in deli s svojimi prijatelji!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Migriram tvoj Ring račun...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Neznano</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Prijavljam tvoje javno ime, lahko traja nekaj časa...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Dodaj napravo</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Uporabniško ime ni na voljo.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Uporabniško ime je na voljo.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Uporabniško ime ni veljavno.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Napaka mreže.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Kopiraj in deli s svojimi prijatelji!</translation>
<translation>Poveži to napravo k računu</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Kako dodati napravo</translation>
</message>
@@ -1877,7 +1904,7 @@ Kopiraj in deli s svojimi prijatelji!</translation>
<translation>Dobrodošli v</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Ustvari svoj profil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Vpiši svoje polno ime:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Ustvari svoj račun</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Izberi svoje uporabniško ime:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Iščem...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Prijavi javno ime (eksperimentalno)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Vpiši svoj PIN</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Geslo</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Potrdi geslo</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Ustvarjam tvoj Ring račun...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Prejšni</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Naprej</translation>
</message>
diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts
index 153c91f..31cb404 100644
--- a/translations/ring_client_windows_sq_AL.ts
+++ b/translations/ring_client_windows_sq_AL.ts
@@ -89,14 +89,14 @@ Ring-u është një software komunikimesh të siguruara dhe të shpërndara.</tr
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Emër përdoruesi</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Krijoni llogari</translation>
</message>
@@ -121,17 +121,17 @@ Ring-u është një software komunikimesh të siguruara dhe të shpërndara.</tr
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Lejo Thirrje Prej të Panjohurish</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Lejo Thirrje Prej Kontaktesh</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Lejo Thirrje Prej Historiku</translation>
</message>
@@ -172,12 +172,12 @@ Ring-u është një software komunikimesh të siguruara dhe të shpërndara.</tr
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring-u është një software komunikimesh të siguruara dhe të shpërndara.</tr
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Rregullime Llogarie Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Përzgjedhje Zileje</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Luaje</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Audio/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Kodekë audio</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Kodekë video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Të mëtejshme</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Regjistrim</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Kohë skadimi regjistrimi (në sekonda):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Ndërfaqe Rrjeti</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Njësoj si parametrat vendorë</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adresë</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Portë</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Përdor STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL Shërbyesi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Përdor TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Maks.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Siguri</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Pajisje</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Anuloje</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Adresë e Publikuar</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>Dëshmi AD</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Dëshmi përdoruesi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Kyç privat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Fjalëkalim kyçi privat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Përdor shifër parazgjedhje</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Pushim</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Zgjidhni Kartelë</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Kartela (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -992,7 +1058,7 @@ Kopjojeni dhe jepuani shokëve!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Audio/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Kopjojeni dhe jepuani shokëve!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Llogari</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Kopjojeni dhe jepuani shokëve!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation type="unfinished"/>
</message>
@@ -1236,25 +1292,20 @@ Kopjojeni dhe jepuani shokëve!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Llogari e Re</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Kopjojeni dhe jepuani shokëve!</translation>
<translation>Mbi</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Krijoni llogari</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>OK</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Anuloje</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Kopjojeni dhe jepuani shokëve!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Llogari Ring</translation>
@@ -1778,7 +1790,7 @@ Kopjojeni dhe jepuani shokëve!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Formësim</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Kopjojeni dhe jepuani shokëve!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>E panjohur</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Kopjojeni dhe jepuani shokëve!</translation>
<translation>Lidheni këtë pajisje me një llogari</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1877,7 +1904,7 @@ Kopjojeni dhe jepuani shokëve!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Krijoni profilin tuaj</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Krijoni llogarinë tuaj</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Regjistroni emër përdoruesi publik (eksperimentale)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Fjalëkalim</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Ripohoni fjalëkalimin</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Pasuesi</translation>
</message>
diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts
index 22b3f8a..37d98d6 100644
--- a/translations/ring_client_windows_sv.ts
+++ b/translations/ring_client_windows_sv.ts
@@ -89,14 +89,14 @@ Ring är säker och distribuerad kommunikationsmjukvara.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Användarnamn</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Lösenord</translation>
</message>
@@ -121,17 +121,17 @@ Ring är säker och distribuerad kommunikationsmjukvara.</translation>
<translation>UPnP aktiverad</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Tillåt samtal från okända</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Tillåt samtal från kontakt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Tillåt samtal från historik</translation>
</message>
@@ -172,12 +172,12 @@ Ring är säker och distribuerad kommunikationsmjukvara.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Registrering i blockkedjan</translation>
</message>
@@ -222,448 +222,514 @@ Ring är säker och distribuerad kommunikationsmjukvara.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ring-kontoinställningar</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Ringsignaler</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Spela</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Ljud/Video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Ljudkodekar</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Videokodekar</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Avancerat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Registrering</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Tidsgräns för registrering (sekunder):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Nätverksgränssnitt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Lokal port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Samma som lokala parametrar</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Ange publicerad adress och port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adress</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Använd STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Serveradress</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Använd TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Område</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP sessionsförhandling (ICE-reserv)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Dessa inställningar används endast under SDP-sessionsförhandling, om ICE inte stöds av server eller deltagare.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Audio RTP portintervall</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Min</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Max</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Video RTP portintervall</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Säkerhet</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Mediaströmkryptering (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Enheter</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Lägg till enhet</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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>För att lägga till en ny enhet till ditt Ring-konto, exporterar du ditt befintliga konto. Detta genererar en PIN-kod, som inom 5 minuter måste anges i din nya enhet.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Lösenord (obligatoriskt)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Export på Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Din PIN-kod:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN-kod</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>Denna PIN-kod skall anges på din nya enhet, inom 5 minuter. Du kan generera en kod ny när du vill.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Bannlysta kontakter</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Publiserad adress</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA-certificat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Användarcertifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Privat nyckel</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Lösenord för privat nyckel</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Använd standardshiffer</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Paus</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>Ring-ID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Välj fil</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Filer (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>Vänta medan din PIN-kod genereras.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Nätverksfel. Försök igen senare.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Fel lösenord.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Registrerar... det kan ta lite tid.</translation>
</message>
@@ -992,7 +1058,7 @@ Kopiera och dela det med dina vänner!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Ljud/Video</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Kopiera och dela det med dina vänner!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Konton</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Kopiera och dela det med dina vänner!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Importera</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Exportera</translation>
</message>
@@ -1236,25 +1292,20 @@ Kopiera och dela det med dina vänner!</translation>
<translation>Starta Ring vid systemstart</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Nytt konto</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Vill du verkligen rensa bort all din historik?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Välj mapp</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Ett fel inträffade vid kontoimport.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Kopiera och dela det med dina vänner!</translation>
<translation>Om</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Sökväg</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Lösenord</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>OK</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Avbryt</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Spara fil</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring-arkivfiler (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Öppna fil</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Kopiera och dela det med dina vänner!</translation>
<translation>Ingen ordinarie e-postklient hittades</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring-konto</translation>
@@ -1778,7 +1790,7 @@ Kopiera och dela det med dina vänner!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Konfiguration</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Kopiera och dela det med dina vänner!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>Ditt konto måste migreras. Ange ditt lösenord.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Migrerar ditt Ring-konto...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Okänd</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Registrerar ditt offentliga användarnamn, det kan ta några minuter...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Lägg till en enhet</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Användarnamnet är inte tillgängligt.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Användarnamnet är tillgängligt.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Användarnamnet är ogiltigt.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Nätverksfel.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Kopiera och dela det med dina vänner!</translation>
<translation>Koppla denna enhet till ett konto</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Hur man lägger till en enhet</translation>
</message>
@@ -1877,7 +1904,7 @@ Kopiera och dela det med dina vänner!</translation>
<translation>Välkommen till</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1900,34 +1927,34 @@ p, li { white-space: pre-wrap; }
<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;">Du får då den nödvändiga PIN-koden för att slutföra detta formulär. PIN-koden är giltig endast i </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minuter</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Skapa din profil</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Ange ditt fullständiga namn:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Skapa ditt konto</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Välj användarnamn</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Söker...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>Registrera ditt användarnamn på Ring. Detta reserverar användarnamnet så att endast du kan använda det. Dina vänner kan kontakt dig med ditt användarnamn istället för att använda ditt Ring-ID.</translation>
</message>
@@ -1972,134 +1999,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Registrera ett offentligt namn (experimentellt)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Ange din PIN-kod</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Lösenord</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Bekräfta lösenord</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Genererar ditt Ring-konto...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Föregående</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Nästa</translation>
</message>
diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts
index 707d629..555e11d 100644
--- a/translations/ring_client_windows_tr.ts
+++ b/translations/ring_client_windows_tr.ts
@@ -89,14 +89,14 @@ Ring güvenli ve dağıtık bir iletişim yazılımıdır.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Kullanıcı adı</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Parola</translation>
</message>
@@ -121,17 +121,17 @@ Ring güvenli ve dağıtık bir iletişim yazılımıdır.</translation>
<translation>UPnP etkin</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Bilinmeyenden Aramaya İzin Ver</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Kişilerden Aramaya İzin Ver</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Geçmişten Aramaya İzin Ver</translation>
</message>
@@ -172,12 +172,12 @@ Ring güvenli ve dağıtık bir iletişim yazılımıdır.</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>Kayıt zinciri üzerinde kaydet</translation>
</message>
@@ -222,448 +222,514 @@ Ring güvenli ve dağıtık bir iletişim yazılımıdır.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ring Hesap Ayarları</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Zil Sesi Seçimi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Oynat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Ses/Görüntü</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Ses çözücüleri</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Görüntü çözücüler</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Gelişmiş</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Kaydolma</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Kaydolma bitimi zaman aşımı (saniye):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Ağ Arayüzü</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Yerel Delik:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Yerel değişkenlerle aynı</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Yayımlanan yeri ve deliği belirle:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Adres</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Delik</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>STUN kullan</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>Sunucu adresi</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>TURN kullan</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Yetki alanı</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP Görüşme Oturumu (ICE Geri çekilme)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Bu ayarlar yalnızca SDP oturum müzakeresi sırasında ICE'nin sunucu ya da eş tarafından desteklenmemesi durumunda kullanılacaktır.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>RTP Ses Port Aralığı</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Asgari</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Azami</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Görüntü RTP Delik Aralığı</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Güvenlik</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Ortam Akışı Şifreleme (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>Aygıtlar</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>Aygıt ekle</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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 hesabınıza yeni bir aygıt eklemek için hesabınızı Ring üzerinden dışarıya aktarın. Bu işlem yeni eklenecek cihaza 5 dakika içerisinde girilmesi gereken bir PIN kodu yaratacaktır.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>Parola (gerekli)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Ring'de Dışa Aktar</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>Oluşturulan pin'iniz:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>Bu anahtar 5 dakika içerisinde aygıtınıza girilmiş olmalı. İstediğiniz an yenisini oluşturabilirsiniz.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>TAMAM</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>Engellenmiş Kişiler</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Yayımlanan Yer</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA sertifikası</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Kullanıcı sertifikası</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Özel anahtar</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Özel anahtar parolası</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Öntanımlı şifrelemeyi kullan</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Duraklat</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>Ring Kimliği</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Dosya Seç</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Dosyalar (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>PIN'iniz oluşturulurken lütfen bekleyin.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>Ağ Hatası. Lütfen daha sonra yeniden deneyin.</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>Yanlış parola</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>Kaydediliyor... Biraz zaman alabilir</translation>
</message>
@@ -992,7 +1058,7 @@ Kopyala ve arkadaşlarınla paylaş!</translation>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>Ses/Görüntü</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Kopyala ve arkadaşlarınla paylaş!</translation>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>Hesaplar</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Kopyala ve arkadaşlarınla paylaş!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>İçe aktar</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Dışa aktar</translation>
</message>
@@ -1236,25 +1292,20 @@ Kopyala ve arkadaşlarınla paylaş!</translation>
<translation>Ring'i başlangıçta çalıştır</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Yeni Hesap</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Tüm geçmişinizi silmek istediğinizden emin misiniz?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Dizin Seç</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>Hesap içe aktarılırken bir hata oldu.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Kopyala ve arkadaşlarınla paylaş!</translation>
<translation>Hakkında</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Yol</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Parola</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Tamam</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>İptal</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Dosyayı Kaydet</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring arşiv dosyaları (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Dosyayı Aç</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Kopyala ve arkadaşlarınla paylaş!</translation>
<translation>Varsayılan posta istemcisi bulunmadı</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring Hesabı</translation>
@@ -1778,7 +1790,7 @@ Kopyala ve arkadaşlarınla paylaş!</translation>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>Yapılandırma</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Kopyala ve arkadaşlarınla paylaş!</translation>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>Ring hesabınız göç ettiriliyor...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Bilinmeyen</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>Herkese açık kullanıcı adınız kaydediliyor, birkaç dakika sürebilir...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>Bir aygıt ekle</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>Kullanıcı adı uygun değil</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>Kullanıcı adı uygun</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>Kullanıcı adı geçersiz.</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>Ağ hatası.</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Kopyala ve arkadaşlarınla paylaş!</translation>
<translation>Bu aygıtı bir hesaba bağla</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>Bir aygıt nasıl eklenir</translation>
</message>
@@ -1877,7 +1904,7 @@ Kopyala ve arkadaşlarınla paylaş!</translation>
<translation>Hoş Geldiniz</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>Profilinizi oluşturun</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>Tam adınızı girin:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>Hesabınızı oluşturun</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Kullanıcı adınızı seçin</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>Arama yapılıyor...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>Kullanıcı adınızı Ring sisteminde kaydedin. Bu işlem kullanıcı adınızı yalnızca sizin için ayıracak ve arkadaşlarınız sizi RingID'niz yerine kullanıcı adınızı kullanarak arayabilecek.</translation>
</message>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>Halka açık kullanıcı adı kaydet (deneysel)</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>Pin'inizi girin</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Parola</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Parolayı onayla</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Ring hesabınız oluşturuluyor...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>Önceki</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>İleri</translation>
</message>
diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index 8ed1e06..769f8ac 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -89,14 +89,14 @@ Ring - це безпечне і децентралізоване програм
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>Ім’я</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
@@ -121,17 +121,17 @@ Ring - це безпечне і децентралізоване програм
<translation>UPnP включено</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>Приймати дзвінки від невідомих контактів</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>Приймати дзвінки від контактів</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>Приймати дзвінки від контактів з історії</translation>
</message>
@@ -172,12 +172,12 @@ Ring - це безпечне і децентралізоване програм
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -222,448 +222,514 @@ Ring - це безпечне і децентралізоване програм
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Налаштування аккаунту Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>Вибір рингтону</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>Програти</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>Аудіо/Відео</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>Аудіо кодеки</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>Відео кодеки</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>Додаткові</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>Реєстрація</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>Час придатності регістрації (секунди):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>Мережевий інтерфейс</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>Локальний порт:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>Аналогічно локальним налашуванням</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>Встановити оголошену адресу та порт:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>Адреса</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>Порт</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>Використовувати STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>URL серверу</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>Використовувати TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>Оточення</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Погодження сесій SDP (резервування ICE)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Ці налаштування використовуються лише протягом SDP сессії у випадку коли сервер чи клієнт не підтримують ICE.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>Порти для передачі аудіо по RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>Мінімально</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>Максимально</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>Порти для передачі відео по RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>Безпека</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Шифрування медіа потоку (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>Відміна</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>Опублікована адреса</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA сертифікат</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>Сертифікат користувача</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>Приватний ключ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>Пароль від приватного ключа</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>Використовувати шифрувальники за замовчуванням</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>Вибрати файл</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>Файли (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -1211,22 +1277,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>Імпортувати</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>Експортувати</translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation>Завантажувати Ring разом з системою</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>Новий аккаунт</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Ви все ще бажаєте очистити історію?</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>Обрати директорію</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>При імпорті облікового запису трапилася помилка.</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation>Про программу</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>Шлях</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>Пароль</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>Ок</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>Відміна</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>Зберегти файл</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Архівні файли Ring (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>Відкрити файл</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation>Не знайдено жодного поштового клієнту</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>Невідомий</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1891,34 +1918,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>Оберіть ваше ім'я користувача</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1963,134 +1990,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>Підтвердити пароль</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Генерація вашого облікового запису Ring...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>Наступний</translation>
</message>
diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts
index bb1c0f2..4ac3e93 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -88,14 +88,14 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>使用者名</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>密码</translation>
</message>
@@ -120,17 +120,17 @@ Ring is a secured and distributed communication software.</source>
<translation>UPnP 已啟動</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>允許未知來電</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>允許通訊錄來電</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>允許歷史來電</translation>
</message>
@@ -171,12 +171,12 @@ Ring is a secured and distributed communication software.</source>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation type="unfinished"/>
</message>
@@ -221,448 +221,514 @@ Ring is a secured and distributed communication software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ring 帳號設定</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>播放</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>音訊/視訊</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>音訊編碼器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>視訊編碼器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>進階</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>註冊</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>網路介面</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>與本地參數相同</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>設定公開地址與連結埠：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>地址</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>埠</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>使用STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>使用</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<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="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>最小值</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>最大值</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>安全</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>媒體串流加密(SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<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="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>公開發佈地址</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA 認證</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>使用者認證</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>私鑰</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>私鑰保護密碼</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>使用預設加密方式</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>暫停</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>選擇檔案</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>檔案(*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation type="unfinished"/>
</message>
@@ -991,7 +1057,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>音訊/視訊</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1001,7 +1067,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>帳號</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1210,22 +1276,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>載入</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>輸出</translation>
</message>
@@ -1235,25 +1291,20 @@ Copy and share it with your friends!</source>
<translation>啟動時執行</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>注册</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>選擇目錄</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1536,45 +1587,6 @@ Copy and share it with your friends!</source>
<translation>關於</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>路徑</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>密码</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>確定</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>取消</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <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"/>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>開啟檔案</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1634,7 +1646,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation type="unfinished"/>
@@ -1777,7 +1789,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>設定</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1811,50 +1823,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>未知</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1866,7 +1893,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation type="unfinished"/>
</message>
@@ -1876,7 +1903,7 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1890,34 +1917,34 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>创建你的个人资料</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>创建你的账户</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>選擇你的使用者名稱</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1962,134 +1989,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>密码</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>Ring 帳號產生中...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>下一步</translation>
</message>
diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts
index 6ae9ad5..70ce168 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -89,14 +89,14 @@ Ring是安全的、分布式的通讯软件。</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>用户名</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>密码</translation>
</message>
@@ -121,17 +121,17 @@ Ring是安全的、分布式的通讯软件。</translation>
<translation>UPnP已启用</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>允许未知来电</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>允许通讯录来电</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>允许历史记录再次来电</translation>
</message>
@@ -172,12 +172,12 @@ Ring是安全的、分布式的通讯软件。</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>在区块链上注册</translation>
</message>
@@ -222,448 +222,514 @@ Ring是安全的、分布式的通讯软件。</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ring帐户设置</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>铃声选择</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>播放</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>音频/视频</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>音频编码</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>视频编码</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>高级</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>注册</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>注册超时（秒）：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>网络接口</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>本地端口：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>与本地配置相同</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>设置公开地址与端口：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>地址：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>端口</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>使用STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>服务器URL</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>使用TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>域</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP协议握手（当ICE协议不受支持）</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>该设置仅用于SDP握手，仅当服务器或客户端不支持ICE时生效。</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>音频RTP端口范围</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>最小</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>最大</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>视频RTP端口范围</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>安全</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>流媒体加密（SRTP）</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>设备</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>添加设备</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>密码（必填）</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>Ring导出</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>您的PIN：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>该PIN需要在5分钟内输入您的新设备。您可以随时生成新的PIN。</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>确定</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>已屏蔽的联系人</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>公开地址</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>颁发机构证书</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>用户证书</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>私钥</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>私钥密码</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>使用默认加密算法</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>暂停</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>选择文件</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>文件 (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>正在生成您的PIN，请稍等。</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>网络错误，请稍后重试。</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>密码错误。</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>正在注册…可能需要一些时间</translation>
</message>
@@ -992,7 +1058,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>音频/视频</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
@@ -1002,7 +1068,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>帐户</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1211,22 +1277,12 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>倒入</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>导出</translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation>系统启动时运行Ring</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>新帐户</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>确定删除您的所有历史记录吗？</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>选择文件夹</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>导入帐户时发生错误。</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation>关于</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>路径</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>密码</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>确定</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>取消</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>保存文件</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring档案文件 (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>打开文件</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation>未找到默认邮件客户端</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring帐户</translation>
@@ -1778,7 +1790,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>参数设置</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>您的Ring帐户可以被更新。\n请输入您的密码。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>正在迁移您的Ring帐户…</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>未知</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>正在注册您的公共用户名，可能需要几分钟…</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>添加设备</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>用户名不可用。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>用户名可用。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>用户名非法。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>网络错误。</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation>将此设备与一个帐户进行连接</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>如何添加设备</translation>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation>欢迎来到</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1900,34 +1927,34 @@ p, li { white-space: pre-wrap; }
<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="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>创建您的帐户资料</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>输入您的全名：</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>创建Ring帐户</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>设置您的用户名</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>正在搜索…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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>
@@ -1972,134 +1999,174 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="482"/>
<source>Photobooth Widget</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
+ <location filename="../wizarddialog.ui" line="509"/>
<source>Avatar display</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
+ <location filename="../wizarddialog.ui" line="588"/>
<source>Full name edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
+ <location filename="../wizarddialog.ui" line="594"/>
<source>Text entry for full name input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
+ <location filename="../wizarddialog.ui" line="673"/>
<source>Public username checkbox</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
+ <location filename="../wizarddialog.ui" line="676"/>
<source>Checkbox selecting if the user wants a public username</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
+ <location filename="../wizarddialog.ui" line="679"/>
<source>Register public username (experimental)</source>
<translation>注册公共用户名（试验性）</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
+ <location filename="../wizarddialog.ui" line="724"/>
<source>Public username edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
+ <location filename="../wizarddialog.ui" line="746"/>
<source>Public username validation status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>输入您的PIN</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>密码</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>确认密码</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>正在生成您的Ring帐户…</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>上一步</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>下一步</translation>
</message>
diff --git a/translations/ring_client_windows_zh_TW.ts b/translations/ring_client_windows_zh_TW.ts
index 00b672d..176b45e 100644
--- a/translations/ring_client_windows_zh_TW.ts
+++ b/translations/ring_client_windows_zh_TW.ts
@@ -10,12 +10,12 @@
<message>
<location filename="../aboutdialog.ui" line="462"/>
<source>about button</source>
- <translation type="unfinished"/>
+ <translation>關於按鈕</translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="478"/>
<source>credits button</source>
- <translation type="unfinished"/>
+ <translation>感謝按鈕</translation>
</message>
<message>
<location filename="../aboutdialog.ui" line="481"/>
@@ -89,14 +89,14 @@ RIng 是一個安全且分散式的通訊軟體。</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="426"/>
- <location filename="../accountdetails.ui" line="1572"/>
- <location filename="../accountdetails.cpp" line="115"/>
+ <location filename="../accountdetails.ui" line="1754"/>
+ <location filename="../accountdetails.cpp" line="117"/>
<source>Username</source>
<translation>使用者名稱</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="469"/>
- <location filename="../accountdetails.ui" line="1594"/>
+ <location filename="../accountdetails.ui" line="1776"/>
<source>Password</source>
<translation>密碼</translation>
</message>
@@ -121,39 +121,39 @@ RIng 是一個安全且分散式的通訊軟體。</translation>
<translation>UPnP 已啟用</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="680"/>
+ <location filename="../accountdetails.ui" line="862"/>
<source>Allow Call From Unknown</source>
<translation>允許從未知對象的通話</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="713"/>
+ <location filename="../accountdetails.ui" line="895"/>
<source>Allow Call From Contact</source>
<translation>允許從聯絡人來的通話</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="698"/>
+ <location filename="../accountdetails.ui" line="880"/>
<source>Allow Call From History</source>
<translation>允許從歷史紀錄而來的通話</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="69"/>
<source>General account info configuration</source>
- <translation type="unfinished"/>
+ <translation>一般帳號資訊設定</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="169"/>
<source>Displayed name</source>
- <translation type="unfinished"/>
+ <translation>顯示名稱</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="191"/>
<source>Displayed alias input</source>
- <translation type="unfinished"/>
+ <translation>顯示別稱輸入</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="302"/>
<source>Hostname URL for DHT bootstrap or SIP</source>
- <translation type="unfinished"/>
+ <translation>DHT bootstrap 或 SIP 的主機名稱 URL</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="323"/>
@@ -163,21 +163,21 @@ RIng 是一個安全且分散式的通訊軟體。</translation>
<message>
<location filename="../accountdetails.ui" line="350"/>
<source>Ring public registered username</source>
- <translation type="unfinished"/>
+ <translation>Ring 公開註冊使用者名稱</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="369"/>
<source>Register username on blockchain button</source>
- <translation type="unfinished"/>
+ <translation>在區塊鏈按鈕上註冊使用者名稱</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="372"/>
- <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"/>
+ <location filename="../accountdetails.cpp" line="108"/>
+ <location filename="../accountdetails.cpp" line="361"/>
+ <location filename="../accountdetails.cpp" line="378"/>
+ <location filename="../accountdetails.cpp" line="383"/>
+ <location filename="../accountdetails.cpp" line="388"/>
+ <location filename="../accountdetails.cpp" line="393"/>
<source>Register on blockchain</source>
<translation>在區塊鏈上註冊</translation>
</message>
@@ -189,481 +189,547 @@ RIng 是一個安全且分散式的通訊軟體。</translation>
<message>
<location filename="../accountdetails.ui" line="411"/>
<source>Nameservice URL input</source>
- <translation type="unfinished"/>
+ <translation>名稱服務 URL 輸入</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="448"/>
<source>SIP username input</source>
- <translation type="unfinished"/>
+ <translation>SIP 使用者名稱輸入</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="491"/>
<source>SIP password input</source>
- <translation type="unfinished"/>
+ <translation>SIP 密碼輸入</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="537"/>
<source>SIP proxy URL input</source>
- <translation type="unfinished"/>
+ <translation>SIP 代理伺服器 URL 輸入</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="580"/>
<source>SIP voicemail number</source>
- <translation type="unfinished"/>
+ <translation>SIP 語音郵件數</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="592"/>
<source>Autoanswer call checkbox</source>
- <translation type="unfinished"/>
+ <translation>通話自動答覆勾選框</translation>
</message>
<message>
<location filename="../accountdetails.ui" line="613"/>
<source>UPnP enabled checkbox</source>
+ <translation>UPnP 啟用勾選框</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="632"/>
+ <source>Old password input line</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="641"/>
+ <source>Input old password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="656"/>
+ <source>Old Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="669"/>
+ <source>New password text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="675"/>
+ <source>Input new password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="692"/>
+ <source>New password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="705"/>
+ <source>Password confirmation text input</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="711"/>
+ <source>Input confirmation </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="727"/>
+ <source>New pass confirmation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="751"/>
+ <source>Change password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="770"/>
+ <source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../accountdetails.ui" line="650"/>
+ <location filename="../accountdetails.ui" line="783"/>
+ <source>Cancel password change button</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="798"/>
+ <source>Changing password ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="832"/>
<source>Ring Account Settings</source>
<translation>Ring 帳號設定</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="856"/>
<source>Allow call from unknown checkbox</source>
- <translation type="unfinished"/>
+ <translation>允許未知通話勾選框</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="692"/>
+ <location filename="../accountdetails.ui" line="874"/>
<source>Allow Call From History checkbox</source>
- <translation type="unfinished"/>
+ <translation>允許歷史通話勾選框</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="710"/>
+ <location filename="../accountdetails.ui" line="892"/>
<source>Allow Call From Contact checkbox</source>
- <translation type="unfinished"/>
+ <translation>允許從聯絡人而來的通話勾選框</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="749"/>
+ <location filename="../accountdetails.ui" line="931"/>
<source>Ringtone Selection</source>
<translation>鈴聲選取</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="773"/>
+ <location filename="../accountdetails.ui" line="955"/>
<source>Play ringtone button</source>
- <translation type="unfinished"/>
+ <translation>播放鈴聲按鈕</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="776"/>
- <location filename="../accountdetails.cpp" line="57"/>
+ <location filename="../accountdetails.ui" line="958"/>
+ <location filename="../accountdetails.cpp" line="58"/>
<source>Play</source>
<translation>播放</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="789"/>
+ <location filename="../accountdetails.ui" line="971"/>
<source>ringtone file selector</source>
- <translation type="unfinished"/>
+ <translation>鈴聲檔案選擇器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="839"/>
+ <location filename="../accountdetails.ui" line="1021"/>
<source>Audio/Video</source>
<translation>音訊／視訊</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="842"/>
+ <location filename="../accountdetails.ui" line="1024"/>
<source>Audio/video codecs preferences configuration</source>
- <translation type="unfinished"/>
+ <translation>音訊／視訊編解碼器偏好設定</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1058"/>
+ <location filename="../accountdetails.ui" line="1240"/>
<source>Audio codecs</source>
<translation>音訊編解碼器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1088"/>
+ <location filename="../accountdetails.ui" line="1270"/>
<source>Video codecs</source>
<translation>視訊編解碼器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1105"/>
+ <location filename="../accountdetails.ui" line="1287"/>
<source>Advanced</source>
<translation>進階</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1108"/>
+ <location filename="../accountdetails.ui" line="1290"/>
<source>Account advanced configuration</source>
- <translation type="unfinished"/>
+ <translation>帳號進階設定</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1154"/>
+ <location filename="../accountdetails.ui" line="1336"/>
<source>Registration</source>
<translation>註冊</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1174"/>
+ <location filename="../accountdetails.ui" line="1356"/>
<source>Registration expire timeout (seconds):</source>
<translation>註冊過期逾時（秒）：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1190"/>
+ <location filename="../accountdetails.ui" line="1372"/>
<source>Registration timeout selector spinbox</source>
- <translation type="unfinished"/>
+ <translation>註冊逾時選擇器選擇框</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1215"/>
+ <location filename="../accountdetails.ui" line="1397"/>
<source>Network Interface</source>
<translation>網路介面</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1236"/>
+ <location filename="../accountdetails.ui" line="1418"/>
<source>Local Port:</source>
<translation>本機連接埠：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1254"/>
+ <location filename="../accountdetails.ui" line="1436"/>
<source>local port selector spinbox</source>
- <translation type="unfinished"/>
+ <translation>本機埠選擇器框</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1340"/>
+ <location filename="../accountdetails.ui" line="1522"/>
<source>same as local radio button</source>
- <translation type="unfinished"/>
+ <translation>與本機相同單選按鈕</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1528"/>
<source>Same as local parameters</source>
<translation>與本機參數相同</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1364"/>
+ <location filename="../accountdetails.ui" line="1546"/>
<source>personalise address and ports radio button</source>
- <translation type="unfinished"/>
+ <translation>個人化地址與連接埠單選按鈕</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1370"/>
+ <location filename="../accountdetails.ui" line="1552"/>
<source>Set published address and port:</source>
<translation>設定公開位置與連接埠：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1396"/>
+ <location filename="../accountdetails.ui" line="1578"/>
<source>Address</source>
<translation>地址</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1415"/>
+ <location filename="../accountdetails.ui" line="1597"/>
<source>ip address text input</source>
- <translation type="unfinished"/>
+ <translation>IP 位置文字輸入</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1430"/>
+ <location filename="../accountdetails.ui" line="1612"/>
<source>Port</source>
<translation>連接埠</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1449"/>
+ <location filename="../accountdetails.ui" line="1631"/>
<source>port selector spinbox</source>
- <translation type="unfinished"/>
+ <translation>連接埠選擇器框</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1484"/>
+ <location filename="../accountdetails.ui" line="1666"/>
<source>use STUN checkbox</source>
- <translation type="unfinished"/>
+ <translation>使用 STUN 勾選框</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1490"/>
+ <location filename="../accountdetails.ui" line="1672"/>
<source>Use STUN</source>
<translation>使用 STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1506"/>
- <location filename="../accountdetails.ui" line="1553"/>
+ <location filename="../accountdetails.ui" line="1688"/>
+ <location filename="../accountdetails.ui" line="1735"/>
<source>Server URL</source>
<translation>伺服器網址</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1528"/>
+ <location filename="../accountdetails.ui" line="1710"/>
<source>use TURN checkbox</source>
- <translation type="unfinished"/>
+ <translation>使用 TURN 勾選框</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1534"/>
+ <location filename="../accountdetails.ui" line="1716"/>
<source>Use TURN</source>
<translation>使用 TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1550"/>
+ <location filename="../accountdetails.ui" line="1732"/>
<source>TURN server URL input</source>
- <translation type="unfinished"/>
+ <translation>TURN 伺服器輸入</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1569"/>
+ <location filename="../accountdetails.ui" line="1751"/>
<source>TURN server username input</source>
- <translation type="unfinished"/>
+ <translation>TURN 伺服器使用者名稱輸入</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1588"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>TURN server password input</source>
- <translation type="unfinished"/>
+ <translation>TURN 伺服器密碼輸入</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1610"/>
+ <location filename="../accountdetails.ui" line="1792"/>
<source>TURN server Realm input</source>
- <translation type="unfinished"/>
+ <translation>TURN 伺服器範圍輸入</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1613"/>
+ <location filename="../accountdetails.ui" line="1795"/>
<source>Realm</source>
<translation>領域</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1662"/>
+ <location filename="../accountdetails.ui" line="1844"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP 工作階段協商（ICE 退回）</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1690"/>
+ <location filename="../accountdetails.ui" line="1872"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>這些設定將僅用於 SDP 工作階段協商，以防伺服器或對方不支援 ICE。</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1732"/>
+ <location filename="../accountdetails.ui" line="1914"/>
<source>Audio RTP Port Range</source>
<translation>音訊 RTP 連接埠範圍</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1762"/>
- <location filename="../accountdetails.ui" line="1902"/>
+ <location filename="../accountdetails.ui" line="1944"/>
+ <location filename="../accountdetails.ui" line="2084"/>
<source>Min</source>
<translation>最小值</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1778"/>
- <location filename="../accountdetails.ui" line="1918"/>
+ <location filename="../accountdetails.ui" line="1960"/>
+ <location filename="../accountdetails.ui" line="2100"/>
<source>Lower boundary for audio RTP port range selector</source>
- <translation type="unfinished"/>
+ <translation>音訊 RTP 連接埠的下限範圍選擇器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1796"/>
- <location filename="../accountdetails.ui" line="1936"/>
+ <location filename="../accountdetails.ui" line="1978"/>
+ <location filename="../accountdetails.ui" line="2118"/>
<source>Max</source>
<translation>最大值</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1812"/>
- <location filename="../accountdetails.ui" line="1952"/>
+ <location filename="../accountdetails.ui" line="1994"/>
+ <location filename="../accountdetails.ui" line="2134"/>
<source>higher boundary for audio RTP port range selector</source>
- <translation type="unfinished"/>
+ <translation>音訊 RTP 連接埠的上限範圍選擇器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1872"/>
+ <location filename="../accountdetails.ui" line="2054"/>
<source>Video RTP Port Range</source>
<translation>視訊 RTP 連接埠範圍</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2004"/>
+ <location filename="../accountdetails.ui" line="2186"/>
<source>Security</source>
<translation>安全性</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2007"/>
+ <location filename="../accountdetails.ui" line="2189"/>
<source>Account security configuration</source>
- <translation type="unfinished"/>
+ <translation>帳號安全性設定</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2094"/>
+ <location filename="../accountdetails.ui" line="2276"/>
<source>Certificate authaurity certificate selector</source>
- <translation type="unfinished"/>
+ <translation>憑證簽發者選擇器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2131"/>
+ <location filename="../accountdetails.ui" line="2313"/>
<source>User certificate selector</source>
- <translation type="unfinished"/>
+ <translation>使用者憑證選擇器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2189"/>
+ <location filename="../accountdetails.ui" line="2371"/>
<source>private key password input</source>
- <translation type="unfinished"/>
+ <translation>私密金鑰密碼輸入</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2211"/>
+ <location filename="../accountdetails.ui" line="2393"/>
<source>User private key selector</source>
- <translation type="unfinished"/>
+ <translation>使用者私密金鑰選擇器</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2235"/>
+ <location filename="../accountdetails.ui" line="2417"/>
<source>Encrypt media stream (SRTP) checkbox</source>
- <translation type="unfinished"/>
+ <translation>加密媒體串流 (SRTP) 勾選框</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2238"/>
+ <location filename="../accountdetails.ui" line="2420"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>媒體串流加密（SRTP）</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2250"/>
+ <location filename="../accountdetails.ui" line="2432"/>
<source>use default ciphers checkbox</source>
- <translation type="unfinished"/>
+ <translation>使用預設密碼本勾選框</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2306"/>
+ <location filename="../accountdetails.ui" line="2488"/>
<source>Devices</source>
<translation>裝置</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2309"/>
+ <location filename="../accountdetails.ui" line="2491"/>
<source>Account devices management</source>
- <translation type="unfinished"/>
+ <translation>帳號裝置管理</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2353"/>
+ <location filename="../accountdetails.ui" line="2535"/>
<source>Add device button</source>
- <translation type="unfinished"/>
+ <translation>新增裝置按鈕</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2356"/>
+ <location filename="../accountdetails.ui" line="2538"/>
<source>Add device</source>
<translation>新增裝置</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2383"/>
+ <location filename="../accountdetails.ui" line="2565"/>
<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 分鐘內輸入到您的新裝置上。</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2396"/>
+ <location filename="../accountdetails.ui" line="2578"/>
<source>Password text input</source>
- <translation type="unfinished"/>
+ <translation>密碼文字輸入</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2402"/>
+ <location filename="../accountdetails.ui" line="2584"/>
<source>Password (required)</source>
<translation>密碼（必要）</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2430"/>
+ <location filename="../accountdetails.ui" line="2612"/>
<source>Cancel account export for linking button</source>
- <translation type="unfinished"/>
+ <translation>取消帳號匯出連結按鈕</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2433"/>
+ <location filename="../accountdetails.ui" line="786"/>
+ <location filename="../accountdetails.ui" line="2615"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2459"/>
+ <location filename="../accountdetails.ui" line="2641"/>
<source>Validate export on DHT for device linking button</source>
- <translation type="unfinished"/>
+ <translation>驗證供裝置連結在 DHT 上匯出按鈕</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2462"/>
+ <location filename="../accountdetails.ui" line="2644"/>
<source>Export on the Ring</source>
<translation>在 Ring 上匯出</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2514"/>
+ <location filename="../accountdetails.ui" line="2696"/>
<source>Your generated pin:</source>
<translation>您的已生成 PIN 碼：</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2527"/>
+ <location filename="../accountdetails.ui" line="2709"/>
<source>Generated PIN for linking</source>
- <translation type="unfinished"/>
+ <translation>已生成供連結之 PIN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2530"/>
+ <location filename="../accountdetails.ui" line="2712"/>
<source>PIN</source>
<translation>PIN 碼</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2540"/>
+ <location filename="../accountdetails.ui" line="2722"/>
<source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
<translation>這個 PIN 碼應該要在 5 分鐘內於您的新裝置上輸入。您可以在任何時候生成新的。</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2559"/>
+ <location filename="../accountdetails.ui" line="2741"/>
<source>Accept PIN generation and quit button</source>
- <translation type="unfinished"/>
+ <translation>接受 PIN 生成與結束按鈕</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2562"/>
+ <location filename="../accountdetails.ui" line="2744"/>
<source>OK</source>
<translation>確定</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2587"/>
+ <location filename="../accountdetails.ui" line="2769"/>
<source>Banned Contacts</source>
<translation>黑名單聯絡人</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2590"/>
+ <location filename="../accountdetails.ui" line="2772"/>
<source>Account banned contacts management tab</source>
- <translation type="unfinished"/>
+ <translation>帳號已阻擋聯絡人管理分頁</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1313"/>
+ <location filename="../accountdetails.ui" line="1495"/>
<source>Published Address</source>
<translation>公開位置</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2072"/>
+ <location filename="../accountdetails.ui" line="2254"/>
<source>CA certificate</source>
<translation>CA 證書</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2112"/>
+ <location filename="../accountdetails.ui" line="2294"/>
<source>User certificate</source>
<translation>使用者證書</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2149"/>
+ <location filename="../accountdetails.ui" line="2331"/>
<source>Private key</source>
<translation>私密金鑰</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2164"/>
+ <location filename="../accountdetails.ui" line="2346"/>
<source>Private key password</source>
<translation>私密金鑰密碼</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2253"/>
+ <location filename="../accountdetails.ui" line="2435"/>
<source>Use default ciphers</source>
<translation>使用預設加密法</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="55"/>
+ <location filename="../accountdetails.cpp" line="56"/>
<source>Pause</source>
<translation>暫停</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="101"/>
+ <location filename="../accountdetails.cpp" line="103"/>
<source>RingID</source>
<translation>RingID</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="229"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Choose File</source>
<translation>選擇檔案</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="231"/>
+ <location filename="../accountdetails.cpp" line="233"/>
<source>Files (*)</source>
<translation>檔案 (*)</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="304"/>
+ <location filename="../accountdetails.cpp" line="306"/>
<source>Please wait while your PIN is generated.</source>
<translation>請等待您的 PIN 碼生成。</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="323"/>
+ <location filename="../accountdetails.cpp" line="325"/>
<source>Network Error. Please try again later.</source>
<translation>網路錯誤。請稍後再試。</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="327"/>
+ <location filename="../accountdetails.cpp" line="329"/>
<source>Wrong password.</source>
<translation>錯誤的密碼。</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="354"/>
+ <location filename="../accountdetails.cpp" line="356"/>
<source>Registering... It may take some time</source>
<translation>正在註冊... 這會耗費一些時間</translation>
</message>
@@ -678,7 +744,7 @@ RIng 是一個安全且分散式的通訊軟體。</translation>
<message>
<location filename="../bannedcontactswidget.ui" line="41"/>
<source>Banned contacts list</source>
- <translation type="unfinished"/>
+ <translation>已阻擋聯絡人清單</translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="69"/>
@@ -688,7 +754,7 @@ RIng 是一個安全且分散式的通訊軟體。</translation>
<message>
<location filename="../bannedcontactswidget.ui" line="101"/>
<source>Deban contact button</source>
- <translation type="unfinished"/>
+ <translation>取消阻擋聯絡人按鈕</translation>
</message>
<message>
<location filename="../bannedcontactswidget.ui" line="104"/>
@@ -701,12 +767,12 @@ RIng 是一個安全且分散式的通訊軟體。</translation>
<message>
<location filename="../callutilsdialog.ui" line="53"/>
<source>existing contacts list</source>
- <translation type="unfinished"/>
+ <translation>既存的聯絡人清單</translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="68"/>
<source>contact transfer number text entry</source>
- <translation type="unfinished"/>
+ <translation>聯絡人轉接號碼文字項目</translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="71"/>
@@ -716,7 +782,7 @@ RIng 是一個安全且分散式的通訊軟體。</translation>
<message>
<location filename="../callutilsdialog.ui" line="110"/>
<source>Transfer call button</source>
- <translation type="unfinished"/>
+ <translation>轉接按鈕</translation>
</message>
<message>
<location filename="../callutilsdialog.ui" line="113"/>
@@ -749,17 +815,17 @@ RIng 是一個安全且分散式的通訊軟體。</translation>
<message>
<location filename="../callwidget.ui" line="207"/>
<source>Search contact text input</source>
- <translation type="unfinished"/>
+ <translation>搜尋聯絡人文字輸入</translation>
</message>
<message>
<location filename="../callwidget.ui" line="248"/>
<source>search button</source>
- <translation type="unfinished"/>
+ <translation>搜尋按鈕</translation>
</message>
<message>
<location filename="../callwidget.ui" line="557"/>
<source>Configuration menu</source>
- <translation type="unfinished"/>
+ <translation>設定選單</translation>
</message>
<message>
<location filename="../callwidget.ui" line="680"/>
@@ -771,12 +837,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../callwidget.ui" line="791"/>
<source>Show ring ID QR code</source>
- <translation type="unfinished"/>
+ <translation>顯示 Ring ID 二維條碼</translation>
</message>
<message>
<location filename="../callwidget.ui" line="842"/>
<source>Share ring ID button</source>
- <translation type="unfinished"/>
+ <translation>分享 Ring ID 按鈕</translation>
</message>
<message>
<location filename="../callwidget.ui" line="900"/>
@@ -793,12 +859,12 @@ Copy and share it with your friends!</source>
<location filename="../callwidget.ui" line="1069"/>
<location filename="../callwidget.ui" line="1840"/>
<source>Back to homepage button</source>
- <translation type="unfinished"/>
+ <translation>回到首頁按鈕</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1189"/>
<source>Peer contact method selector</source>
- <translation type="unfinished"/>
+ <translation>對方聯絡人方法選擇器</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1208"/>
@@ -834,12 +900,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../callwidget.ui" line="1498"/>
<source>Answer incoming call button</source>
- <translation type="unfinished"/>
+ <translation>答覆來電按鈕</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1543"/>
<source>Ignore incoming call button</source>
- <translation type="unfinished"/>
+ <translation>忽略來電按鈕</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1570"/>
@@ -859,7 +925,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../callwidget.ui" line="1726"/>
<source>Cancel outgoing call</source>
- <translation type="unfinished"/>
+ <translation>取消去電</translation>
</message>
<message>
<location filename="../callwidget.ui" line="1749"/>
@@ -964,7 +1030,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../combar.ui" line="72"/>
<source>Call button</source>
- <translation type="unfinished"/>
+ <translation>通話按鈕</translation>
</message>
</context>
<context>
@@ -977,7 +1043,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="97"/>
<source>General configuration tab</source>
- <translation type="unfinished"/>
+ <translation>一般設定分頁</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="103"/>
@@ -987,22 +1053,22 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="119"/>
<source>Audio / Video configuration tab</source>
- <translation type="unfinished"/>
+ <translation>音訊／視訊設定分頁</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="122"/>
<source>Audio/Video</source>
- <translation type="unfinished"/>
+ <translation>音訊／視訊</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="138"/>
<source>Accounts configuration tab</source>
- <translation type="unfinished"/>
+ <translation>帳號設定分頁</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="141"/>
<source>Accounts</source>
- <translation type="unfinished"/>
+ <translation>帳號</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="180"/>
@@ -1052,12 +1118,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="288"/>
<source>Avatar (click to change)</source>
- <translation type="unfinished"/>
+ <translation>大頭貼（點選以變更）</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="311"/>
<source>Display name text input</source>
- <translation type="unfinished"/>
+ <translation>顯示名稱文字輸入</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="314"/>
@@ -1067,12 +1133,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="400"/>
<source>Number of days of history kept</source>
- <translation type="unfinished"/>
+ <translation>保留幾天的歷史</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="484"/>
<source>clear history button</source>
- <translation type="unfinished"/>
+ <translation>清除歷史按鈕</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="527"/>
@@ -1087,12 +1153,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="573"/>
<source>Call records path</source>
- <translation type="unfinished"/>
+ <translation>通話紀錄路徑</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="603"/>
<source>Always record calls checkbox</source>
- <translation type="unfinished"/>
+ <translation>總是記錄通話勾選框</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="609"/>
@@ -1102,12 +1168,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="661"/>
<source>keep minimized on close checkbox</source>
- <translation type="unfinished"/>
+ <translation>在關閉時最小化勾選框</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="679"/>
<source>enable notifications checkbox</source>
- <translation type="unfinished"/>
+ <translation>啟用通知勾選框</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="685"/>
@@ -1117,12 +1183,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="703"/>
<source>Launch ring on startup checkbox</source>
- <translation type="unfinished"/>
+ <translation>在開機時啟動 Ring 勾選框</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="732"/>
<source>Autamatic update checks checkbox</source>
- <translation type="unfinished"/>
+ <translation>自動檢查更新勾選框</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="738"/>
@@ -1132,7 +1198,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="757"/>
<source>Interval between update checks in days selector</source>
- <translation type="unfinished"/>
+ <translation>檢查更新間隔（以天計）選擇器</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="778"/>
@@ -1142,7 +1208,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="817"/>
<source>Check for updates now button</source>
- <translation type="unfinished"/>
+ <translation>立刻檢查更新按鈕</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="933"/>
@@ -1158,7 +1224,7 @@ Copy and share it with your friends!</source>
<location filename="../configurationwidget.ui" line="1042"/>
<location filename="../configurationwidget.ui" line="1061"/>
<source>Video device selector</source>
- <translation type="unfinished"/>
+ <translation>視訊裝置選擇器</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1048"/>
@@ -1173,7 +1239,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="1095"/>
<source>Video device resolution selector</source>
- <translation type="unfinished"/>
+ <translation>視訊裝置解析度選擇器</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1122"/>
@@ -1183,7 +1249,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="1129"/>
<source>Audio output device selector</source>
- <translation type="unfinished"/>
+ <translation>音訊輸出裝置選擇器</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1141"/>
@@ -1193,12 +1259,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="1148"/>
<source>Audio input device selector</source>
- <translation type="unfinished"/>
+ <translation>音訊輸入裝置選擇器</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1226"/>
<source>New account type selector</source>
- <translation type="unfinished"/>
+ <translation>新帳號類型選擇器</translation>
</message>
<message>
<location filename="../configurationwidget.ui" line="1245"/>
@@ -1208,25 +1274,15 @@ Copy and share it with your friends!</source>
<message>
<location filename="../configurationwidget.ui" line="1283"/>
<source>Delete account button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1310"/>
- <source>Import account archive button</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="1313"/>
- <source>Import</source>
- <translation>匯入</translation>
+ <translation>刪除帳號按鈕</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1320"/>
+ <location filename="../configurationwidget.ui" line="1323"/>
<source>Export account button</source>
- <translation type="unfinished"/>
+ <translation>匯出帳號按鈕</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1323"/>
+ <location filename="../configurationwidget.ui" line="1326"/>
<source>Export</source>
<translation>匯出</translation>
</message>
@@ -1236,25 +1292,20 @@ Copy and share it with your friends!</source>
<translation>開機時啟動 Ring</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="322"/>
+ <location filename="../configurationwidget.cpp" line="320"/>
<source>New Account</source>
<translation>新增帳號</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="342"/>
+ <location filename="../configurationwidget.cpp" line="340"/>
<source>Are you sure you want to clear all your history?</source>
<translation>您確定您要清除您所有的歷史？</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="391"/>
+ <location filename="../configurationwidget.cpp" line="389"/>
<source>Choose Directory</source>
<translation>選擇資料夾</translation>
</message>
- <message>
- <location filename="../configurationwidget.cpp" line="421"/>
- <source>An error occured while importing account.</source>
- <translation>當匯入帳號時遇到錯誤。</translation>
- </message>
</context>
<context>
<name>ContactPicker</name>
@@ -1266,7 +1317,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactpicker.ui" line="43"/>
<source>search existing contact text entry</source>
- <translation type="unfinished"/>
+ <translation>搜尋既有的聯絡人文字項目</translation>
</message>
<message>
<location filename="../contactpicker.ui" line="46"/>
@@ -1276,12 +1327,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactpicker.ui" line="56"/>
<source>existing contacts list</source>
- <translation type="unfinished"/>
+ <translation>既存的聯絡人清單</translation>
</message>
<message>
<location filename="../contactpicker.ui" line="63"/>
<source>Create new contact button</source>
- <translation type="unfinished"/>
+ <translation>建立新聯絡人按鈕</translation>
</message>
<message>
<location filename="../contactpicker.ui" line="66"/>
@@ -1296,7 +1347,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactpicker.ui" line="108"/>
<source>New contact name text entry</source>
- <translation type="unfinished"/>
+ <translation>新聯絡人名稱文字項目</translation>
</message>
<message>
<location filename="../contactpicker.ui" line="111"/>
@@ -1306,7 +1357,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactpicker.ui" line="141"/>
<source>Validate contact creation button</source>
- <translation type="unfinished"/>
+ <translation>驗證聯絡人建立按鈕</translation>
</message>
<message>
<location filename="../contactpicker.ui" line="144"/>
@@ -1339,7 +1390,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactrequestwidget.ui" line="125"/>
<source>Accept contact request button</source>
- <translation type="unfinished"/>
+ <translation>接受聯絡人請求按鈕</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="132"/>
@@ -1349,7 +1400,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactrequestwidget.ui" line="151"/>
<source>Mute contact request</source>
- <translation type="unfinished"/>
+ <translation>聯絡人靜音請求</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="158"/>
@@ -1359,7 +1410,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../contactrequestwidget.ui" line="177"/>
<source>Ban contact request</source>
- <translation type="unfinished"/>
+ <translation>阻擋聯絡人請求</translation>
</message>
<message>
<location filename="../contactrequestwidget.ui" line="184"/>
@@ -1377,17 +1428,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../currentaccountwidget.ui" line="97"/>
<source>Account avatar</source>
- <translation type="unfinished"/>
+ <translation>帳號大頭貼</translation>
</message>
<message>
<location filename="../currentaccountwidget.ui" line="128"/>
<source>Account status</source>
- <translation type="unfinished"/>
+ <translation>帳號狀態</translation>
</message>
<message>
<location filename="../currentaccountwidget.ui" line="141"/>
<source>account selection combobox</source>
- <translation type="unfinished"/>
+ <translation>帳號選擇複選框</translation>
</message>
</context>
<context>
@@ -1415,7 +1466,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../deleteaccountdialog.ui" line="138"/>
<source>Cancel contact deletion button</source>
- <translation type="unfinished"/>
+ <translation>取消聯絡人刪除按鈕</translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="141"/>
@@ -1425,7 +1476,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../deleteaccountdialog.ui" line="167"/>
<source>Validate contact deletion button</source>
- <translation type="unfinished"/>
+ <translation>驗證聯絡人刪除按鈕</translation>
</message>
<message>
<location filename="../deleteaccountdialog.ui" line="170"/>
@@ -1448,7 +1499,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../deletecontactdialog.ui" line="123"/>
<source>Cancel contact deletion button</source>
- <translation type="unfinished"/>
+ <translation>取消聯絡人刪除按鈕</translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="126"/>
@@ -1458,7 +1509,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../deletecontactdialog.ui" line="139"/>
<source>Delete contact validation button</source>
- <translation type="unfinished"/>
+ <translation>刪除帳號驗證按鈕</translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="142"/>
@@ -1468,7 +1519,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../deletecontactdialog.ui" line="155"/>
<source>Delete and ban validation button</source>
- <translation type="unfinished"/>
+ <translation>刪除並阻擋驗證按鈕</translation>
</message>
<message>
<location filename="../deletecontactdialog.ui" line="158"/>
@@ -1481,12 +1532,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../instantmessagingwidget.ui" line="38"/>
<source>Message list</source>
- <translation type="unfinished"/>
+ <translation>訊息清單</translation>
</message>
<message>
<location filename="../instantmessagingwidget.ui" line="74"/>
<source>Message input</source>
- <translation type="unfinished"/>
+ <translation>訊息輸入</translation>
</message>
<message>
<location filename="../instantmessagingwidget.ui" line="77"/>
@@ -1496,7 +1547,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../instantmessagingwidget.ui" line="99"/>
<source>Send message button</source>
- <translation type="unfinished"/>
+ <translation>傳送訊息按鈕</translation>
</message>
<message>
<location filename="../instantmessagingwidget.cpp" line="44"/>
@@ -1537,45 +1588,6 @@ Copy and share it with your friends!</source>
<translation>關於</translation>
</message>
</context>
-<context>
- <name>PathPasswordDialog</name>
- <message>
- <location filename="../pathpassworddialog.ui" line="26"/>
- <source>Path</source>
- <translation>路徑</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="46"/>
- <source>Password</source>
- <translation>密碼</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="65"/>
- <source>Ok</source>
- <translation>確定</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.ui" line="72"/>
- <source>Cancel</source>
- <translation>取消</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="60"/>
- <source>Save File</source>
- <translation>儲存檔案</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="62"/>
- <location filename="../pathpassworddialog.cpp" line="67"/>
- <source>Ring archive files (*.ring)</source>
- <translation>Ring 歸檔 (*.ring)</translation>
- </message>
- <message>
- <location filename="../pathpassworddialog.cpp" line="65"/>
- <source>Open File</source>
- <translation>開啟檔案</translation>
- </message>
-</context>
<context>
<name>PhotoBoothDialog</name>
<message>
@@ -1594,7 +1606,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../photoboothwidget.ui" line="20"/>
<source>Photobooth display</source>
- <translation type="unfinished"/>
+ <translation>大頭貼相機顯示</translation>
</message>
<message>
<location filename="../photoboothwidget.ui" line="51"/>
@@ -1635,7 +1647,7 @@ Copy and share it with your friends!</source>
<translation>找不到預設的電子郵件客戶端</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="35"/>
+ <location filename="../wizarddialog.cpp" line="36"/>
<source>Ring account</source>
<comment>Default alias for new Ring account</comment>
<translation>Ring 帳號</translation>
@@ -1646,12 +1658,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../qualitydialog.ui" line="64"/>
<source>Quality slider</source>
- <translation type="unfinished"/>
+ <translation>品質滑桿</translation>
</message>
<message>
<location filename="../qualitydialog.ui" line="103"/>
<source>Automatic quality checkbox</source>
- <translation type="unfinished"/>
+ <translation>自動品質勾選框</translation>
</message>
<message>
<location filename="../qualitydialog.ui" line="106"/>
@@ -1664,17 +1676,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="114"/>
<source>Validate Contact Request Button</source>
- <translation type="unfinished"/>
+ <translation>驗證聯絡人請求按鈕</translation>
</message>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="139"/>
<source>Mute contact request button</source>
- <translation type="unfinished"/>
+ <translation>聯絡人靜音請求按鈕</translation>
</message>
<message>
<location filename="../quickactcontactrequestwidget.ui" line="161"/>
<source>Ban contact request button</source>
- <translation type="unfinished"/>
+ <translation>阻擋聯絡人請求按鈕</translation>
</message>
</context>
<context>
@@ -1682,7 +1694,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../ringbutton.ui" line="140"/>
<source>Select folder</source>
- <translation type="unfinished"/>
+ <translation>選擇資料夾</translation>
</message>
</context>
<context>
@@ -1743,7 +1755,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="338"/>
<source>Record call</source>
- <translation type="unfinished"/>
+ <translation>記錄通話</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="370"/>
@@ -1778,7 +1790,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../videooverlay.ui" line="584"/>
<source>Configuration</source>
- <translation type="unfinished"/>
+ <translation>設定</translation>
</message>
<message>
<location filename="../videooverlay.ui" line="87"/>
@@ -1812,50 +1824,65 @@ Copy and share it with your friends!</source>
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="69"/>
+ <location filename="../wizarddialog.cpp" line="70"/>
<source>Your account needs to be migrated. Enter your password.</source>
<translation>您的帳號需要遷移。輸入您的密碼。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="127"/>
+ <location filename="../wizarddialog.cpp" line="96"/>
<source>Migrating your Ring account...</source>
<translation>正在遷移您的 Ring 帳號...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="148"/>
- <source>Unknown</source>
- <translation>未知</translation>
+ <location filename="../wizarddialog.cpp" line="98"/>
+ <source>Importing account archive...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="183"/>
+ <location filename="../wizarddialog.cpp" line="151"/>
<source>Registering your public username, it may take a few minutes...</source>
<translation>正在註冊您的公開使用者名稱，這可能會耗費數分鐘...</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="243"/>
+ <location filename="../wizarddialog.cpp" line="170"/>
+ <source>An error has occured during your account creation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="227"/>
<source>Add a device</source>
<translation>新增裝置</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="348"/>
+ <location filename="../wizarddialog.cpp" line="339"/>
<source>Username not available.</source>
<translation>使用者名稱不可用</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="351"/>
+ <location filename="../wizarddialog.cpp" line="342"/>
<source>Username is available.</source>
<translation>使用者名稱可用。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="354"/>
+ <location filename="../wizarddialog.cpp" line="345"/>
<source>Username is invalid.</source>
<translation>使用者名稱無效。</translation>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="357"/>
+ <location filename="../wizarddialog.cpp" line="348"/>
<source>Network error.</source>
<translation>網路錯誤。</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="402"/>
+ <source>Open File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="404"/>
+ <source>Ring archive files (*.gz);; All files (*)</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../wizarddialog.ui" line="151"/>
<source>Create Ring account</source>
@@ -1867,7 +1894,7 @@ Copy and share it with your friends!</source>
<translation>連結這個裝置到一個帳號</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="205"/>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>How to add a device</source>
<translation>如何新增裝置</translation>
</message>
@@ -1877,7 +1904,7 @@ Copy and share it with your friends!</source>
<translation>歡迎來到</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="212"/>
+ <location filename="../wizarddialog.ui" line="329"/>
<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; }
@@ -1900,206 +1927,246 @@ p, li { white-space: pre-wrap; }
<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="240"/>
+ <location filename="../wizarddialog.ui" line="450"/>
<source>Create your profile</source>
<translation>建立您的檔案</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="354"/>
+ <location filename="../wizarddialog.ui" line="564"/>
<source>Enter your full name:</source>
<translation>輸入您的完整名稱：</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="419"/>
- <location filename="../wizarddialog.cpp" line="247"/>
+ <location filename="../wizarddialog.ui" line="629"/>
+ <location filename="../wizarddialog.cpp" line="231"/>
<source>Create your account</source>
<translation>建立您的帳號</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="517"/>
+ <location filename="../wizarddialog.ui" line="730"/>
<source>Choose your username</source>
<translation>選擇您的使用者名稱</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="536"/>
- <location filename="../wizarddialog.cpp" line="320"/>
+ <location filename="../wizarddialog.ui" line="749"/>
+ <location filename="../wizarddialog.cpp" line="311"/>
<source>Searching...</source>
<translation>正在搜尋...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="460"/>
+ <location filename="../wizarddialog.ui" line="670"/>
<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="33"/>
<source>Wizard Dialog</source>
- <translation type="unfinished"/>
+ <translation>精靈視窗</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="36"/>
<source>Account creation wizard dialog</source>
- <translation type="unfinished"/>
+ <translation>建立帳號精靈對話框</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="72"/>
<source>Welcome Label</source>
- <translation type="unfinished"/>
+ <translation>歡迎標籤</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="107"/>
<source>Welcome Logo</source>
- <translation type="unfinished"/>
+ <translation>歡迎圖示</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="139"/>
<source>Create Ring account button</source>
- <translation type="unfinished"/>
+ <translation>建立 Ring 帳號按鈕</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="145"/>
<source>Push button for Ring account creation start trigger</source>
- <translation type="unfinished"/>
+ <translation>Ring 帳號建立開始觸發請按下按鈕</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="164"/>
<source>Link device button</source>
- <translation type="unfinished"/>
+ <translation>連結裝置按鈕</translation>
</message>
<message>
<location filename="../wizarddialog.ui" line="170"/>
<source>Push button for device linkage start trigger</source>
- <translation type="unfinished"/>
+ <translation>裝置連結開始觸發請按下按鈕</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="272"/>
- <source>Photobooth Widget</source>
+ <location filename="../wizarddialog.ui" line="205"/>
+ <source>Select link method</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="299"/>
- <source>Avatar display</source>
+ <location filename="../wizarddialog.ui" line="254"/>
+ <source>Link account to device from the network</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="378"/>
- <source>Full name edit</source>
+ <location filename="../wizarddialog.ui" line="257"/>
+ <source>Link account from DHT</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="384"/>
- <source>Text entry for full name input</source>
+ <location filename="../wizarddialog.ui" line="270"/>
+ <source>Link from exported account archive file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="463"/>
- <source>Public username checkbox</source>
+ <location filename="../wizarddialog.ui" line="273"/>
+ <source>Link account from file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="466"/>
- <source>Checkbox selecting if the user wants a public username</source>
+ <location filename="../wizarddialog.ui" line="357"/>
+ <source>Select file to import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="469"/>
- <source>Register public username (experimental)</source>
- <translation>註冊公開的使用者名稱（實驗性）</translation>
+ <location filename="../wizarddialog.ui" line="382"/>
+ <source>Account archive path:</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="511"/>
- <source>Public username edit</source>
+ <location filename="../wizarddialog.ui" line="389"/>
+ <source>Account archive path selector</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="533"/>
- <source>Public username validation status</source>
+ <location filename="../wizarddialog.ui" line="406"/>
+ <source>Archive password:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="545"/>
- <source>Disable password checkbox</source>
+ <location filename="../wizarddialog.ui" line="413"/>
+ <source>Archive passord input</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.ui" line="554"/>
- <source> I do not want to set a password</source>
- <translation type="unfinished"/>
+ <location filename="../wizarddialog.ui" line="482"/>
+ <source>Photobooth Widget</source>
+ <translation>大頭貼相機小工具</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="509"/>
+ <source>Avatar display</source>
+ <translation>大頭貼顯示</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="588"/>
+ <source>Full name edit</source>
+ <translation>完整名稱編輯</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="594"/>
+ <source>Text entry for full name input</source>
+ <translation>完整名稱輸入的文字項目</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="673"/>
+ <source>Public username checkbox</source>
+ <translation>公開使用者名稱勾選框</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="676"/>
+ <source>Checkbox selecting if the user wants a public username</source>
+ <translation>若使用者想要一個公開的使用者名稱就在勾選框打勾</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="679"/>
+ <source>Register public username (experimental)</source>
+ <translation>註冊公開的使用者名稱（實驗性）</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="578"/>
+ <location filename="../wizarddialog.ui" line="724"/>
+ <source>Public username edit</source>
+ <translation>公開使用者名稱編輯</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="746"/>
+ <source>Public username validation status</source>
+ <translation>公開使用者名稱驗證狀態</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="778"/>
<source>PIN edit</source>
- <translation type="unfinished"/>
+ <translation>PIN 編輯</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="584"/>
+ <location filename="../wizarddialog.ui" line="784"/>
<source>Device linking PIN text entry</source>
- <translation type="unfinished"/>
+ <translation>裝置連結 PIN 文字項目</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="587"/>
+ <location filename="../wizarddialog.ui" line="787"/>
<source>Enter your pin</source>
<translation>輸入您的 PIN 碼</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="614"/>
+ <location filename="../wizarddialog.ui" line="814"/>
<source>Password text input</source>
- <translation type="unfinished"/>
+ <translation>密碼文字輸入</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="620"/>
+ <location filename="../wizarddialog.ui" line="820"/>
<source>Password text entry</source>
- <translation type="unfinished"/>
+ <translation>密碼文字項目</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="626"/>
+ <location filename="../wizarddialog.ui" line="826"/>
<source>Password</source>
<translation>密碼</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="653"/>
- <location filename="../wizarddialog.ui" line="659"/>
+ <location filename="../wizarddialog.ui" line="853"/>
+ <location filename="../wizarddialog.ui" line="859"/>
<source>Password confirmation text input</source>
- <translation type="unfinished"/>
+ <translation>確認密碼文字輸入</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="665"/>
+ <location filename="../wizarddialog.ui" line="865"/>
<source>Confirm password</source>
<translation>確認密碼</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="733"/>
- <location filename="../wizarddialog.cpp" line="129"/>
+ <location filename="../wizarddialog.ui" line="933"/>
+ <location filename="../wizarddialog.cpp" line="100"/>
<source>Generating your Ring account...</source>
<translation>正在生成您的 Ring 帳號...</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="769"/>
+ <location filename="../wizarddialog.ui" line="969"/>
<source>Previous page button</source>
- <translation type="unfinished"/>
+ <translation>先前頁面按鈕</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="775"/>
+ <location filename="../wizarddialog.ui" line="975"/>
<source>push button to access previous page of wizard</source>
- <translation type="unfinished"/>
+ <translation>存取前一頁精靈請按下按鈕</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="778"/>
+ <location filename="../wizarddialog.ui" line="978"/>
<source>Previous</source>
<translation>先前</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="810"/>
+ <location filename="../wizarddialog.ui" line="1010"/>
<source>Next page Button</source>
- <translation type="unfinished"/>
+ <translation>下一頁按鈕</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="816"/>
+ <location filename="../wizarddialog.ui" line="1016"/>
<source>Push button to access next page of wizard</source>
- <translation type="unfinished"/>
+ <translation>存取下一頁精靈請按下按鈕</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="819"/>
+ <location filename="../wizarddialog.ui" line="1019"/>
<source>Next</source>
<translation>下一個</translation>
</message>
--
GitLab