i18n: automatic bump
Change-Id: I5ce22de2417369ab1ec1799b0cc56fee3e542d30
diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index 777ffe2..79f21f1 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.0">
<context>
<name>AboutDialog</name>
<message>
@@ -13,39 +13,34 @@
<translation>Подяки</translation>
</message>
<message>
- <location filename="../aboutdialog.ui" line="554"/>
- <source>Release : Louis-Joseph Papineau</source>
- <translation>Реліз: Луї-Жозеф Папінеу</translation>
+ <location filename="../aboutdialog.ui" line="541"/>
+ <source>Release : Beta 2 - Gaston Miron</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.ui" line="570"/>
+ <location filename="../aboutdialog.ui" line="557"/>
<source>The Microsoft Windows client for Ring.
Ring is a secured and distributed communication software.</source>
<translation>Клієнт Ring для Microsoft Windows.
Ring - це безпечне і децентралізоване програмне забезпечення для спілкування</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="32"/>
- <source>Windows Ring</source>
- <translation>Windows Ring</translation>
- </message>
- <message>
- <location filename="../aboutdialog.cpp" line="33"/>
+ <location filename="../aboutdialog.cpp" line="30"/>
<source>version</source>
<translation>версія</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="40"/>
+ <location filename="../aboutdialog.cpp" line="37"/>
<source>Created by:</source>
<translation>Стоворено:</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="52"/>
+ <location filename="../aboutdialog.cpp" line="67"/>
<source>Artwork by:</source>
<translation>Намальовано:</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="56"/>
+ <location filename="../aboutdialog.cpp" line="71"/>
<source>Based on the SFLPhone project</source>
<translation>Базується на проекті SFLPhone</translation>
</message>
@@ -53,330 +48,400 @@
<context>
<name>AccountDetails</name>
<message>
- <location filename="../accountdetails.ui" line="20"/>
+ <location filename="../accountdetails.ui" line="23"/>
<source>Settings</source>
<translation>Налаштування</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="60"/>
+ <location filename="../accountdetails.ui" line="63"/>
<source>General</source>
<translation>Головні</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="175"/>
+ <location filename="../accountdetails.ui" line="137"/>
<source>Account</source>
<translation>Аккаунт</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="238"/>
+ <location filename="../accountdetails.ui" line="197"/>
<source>Type</source>
<translation>Тип</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="204"/>
+ <location filename="../accountdetails.ui" line="163"/>
<source>Alias</source>
<translation>Додаткове ім’я</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="308"/>
+ <location filename="../accountdetails.ui" line="241"/>
<source>Parameters</source>
<translation>Параметри</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="341"/>
+ <location filename="../accountdetails.ui" line="271"/>
<source>Hostname</source>
<translation>Ім'я хоста</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="608"/>
- <location filename="../accountdetails.ui" line="1551"/>
+ <location filename="../accountdetails.ui" line="405"/>
+ <location filename="../accountdetails.ui" line="1482"/>
+ <location filename="../accountdetails.cpp" line="115"/>
<source>Username</source>
<translation>Ім’я</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="381"/>
- <location filename="../accountdetails.ui" line="1570"/>
+ <location filename="../accountdetails.ui" line="445"/>
+ <location filename="../accountdetails.ui" line="1501"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="127"/>
- <source>delete account</source>
- <translation>видалити акаунт</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="424"/>
+ <location filename="../accountdetails.ui" line="488"/>
<source>Proxy</source>
<translation>Проксі</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="464"/>
+ <location filename="../accountdetails.ui" line="528"/>
<source>Voicemail number</source>
<translation>Номер голосової пошти</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="498"/>
+ <location filename="../accountdetails.ui" line="562"/>
<source>Auto-answer calls</source>
<translation>Автоматично відповідати на дзвінки</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="516"/>
+ <location filename="../accountdetails.ui" line="580"/>
<source>UPnP enabled</source>
<translation>UPnP включено</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="531"/>
- <source>DTMF tone type</source>
- <translation>Тип DTMF</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="548"/>
- <source>RTP</source>
- <translation>RTP</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="566"/>
- <source>SIP</source>
- <translation>SIP</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="699"/>
+ <location filename="../accountdetails.ui" line="638"/>
<source>Allow Call From Unknown</source>
<translation>Приймати дзвінки від невідомих контактів</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="726"/>
+ <location filename="../accountdetails.ui" line="665"/>
<source>Allow Call From Contact</source>
<translation>Приймати дзвінки від контактів</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="714"/>
+ <location filename="../accountdetails.ui" line="653"/>
<source>Allow Call From History</source>
<translation>Приймати дзвінки від контактів з історії</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="674"/>
+ <location filename="../accountdetails.ui" line="311"/>
+ <source>Public username</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="354"/>
+ <location filename="../accountdetails.cpp" line="106"/>
+ <location filename="../accountdetails.cpp" line="359"/>
+ <location filename="../accountdetails.cpp" line="376"/>
+ <location filename="../accountdetails.cpp" line="381"/>
+ <location filename="../accountdetails.cpp" line="386"/>
+ <location filename="../accountdetails.cpp" line="391"/>
+ <source>Register on blockchain</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="371"/>
+ <source>Name service URL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="611"/>
<source>Ring Account Settings</source>
<translation>Налаштування аккаунту Ring</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="772"/>
+ <location filename="../accountdetails.ui" line="701"/>
<source>Ringtone Selection</source>
<translation>Вибір рингтону</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="796"/>
- <location filename="../accountdetails.cpp" line="56"/>
+ <location filename="../accountdetails.ui" line="725"/>
+ <location filename="../accountdetails.cpp" line="57"/>
<source>Play</source>
<translation>Програти</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="854"/>
+ <location filename="../accountdetails.ui" line="785"/>
<source>Audio/Video</source>
<translation>Аудіо/Відео</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1070"/>
+ <location filename="../accountdetails.ui" line="1001"/>
<source>Audio codecs</source>
<translation>Аудіо кодеки</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1100"/>
+ <location filename="../accountdetails.ui" line="1031"/>
<source>Video codecs</source>
<translation>Відео кодеки</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1117"/>
+ <location filename="../accountdetails.ui" line="1048"/>
<source>Advanced</source>
<translation>Додаткові</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1163"/>
+ <location filename="../accountdetails.ui" line="1094"/>
<source>Registration</source>
<translation>Реєстрація</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1183"/>
+ <location filename="../accountdetails.ui" line="1114"/>
<source>Registration expire timeout (seconds):</source>
<translation>Час придатності регістрації (секунди):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1221"/>
+ <location filename="../accountdetails.ui" line="1152"/>
<source>Network Interface</source>
<translation>Мережевий інтерфейс</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1242"/>
+ <location filename="../accountdetails.ui" line="1173"/>
<source>Local Port:</source>
<translation>Локальний порт:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1277"/>
<source>Same as local parameters</source>
<translation>Аналогічно локальним налашуванням</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1367"/>
+ <location filename="../accountdetails.ui" line="1298"/>
<source>Set published address and port:</source>
<translation>Встановити оголошену адресу та порт:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1393"/>
+ <location filename="../accountdetails.ui" line="1324"/>
<source>Address</source>
<translation>Адреса</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1424"/>
+ <location filename="../accountdetails.ui" line="1355"/>
<source>Port</source>
<translation>Порт</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1478"/>
+ <location filename="../accountdetails.ui" line="1409"/>
<source>Use STUN</source>
<translation>Використовувати STUN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1494"/>
- <location filename="../accountdetails.ui" line="1535"/>
+ <location filename="../accountdetails.ui" line="1425"/>
+ <location filename="../accountdetails.ui" line="1466"/>
<source>Server URL</source>
<translation>URL серверу</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1519"/>
+ <location filename="../accountdetails.ui" line="1450"/>
<source>Use TURN</source>
<translation>Використовувати TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1586"/>
+ <location filename="../accountdetails.ui" line="1517"/>
<source>Realm</source>
<translation>Оточення</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1635"/>
+ <location filename="../accountdetails.ui" line="1566"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>Погодження сесій SDP (резервування ICE)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1663"/>
+ <location filename="../accountdetails.ui" line="1594"/>
<source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
<translation>Ці налаштування використовуються лише протягом SDP сессії у випадку коли сервер чи клієнт не підтримують ICE.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1705"/>
+ <location filename="../accountdetails.ui" line="1636"/>
<source>Audio RTP Port Range</source>
<translation>Порти для передачі аудіо по RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1735"/>
- <location filename="../accountdetails.ui" line="1869"/>
+ <location filename="../accountdetails.ui" line="1666"/>
+ <location filename="../accountdetails.ui" line="1800"/>
<source>Min</source>
<translation>Мінімально</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1766"/>
- <location filename="../accountdetails.ui" line="1900"/>
+ <location filename="../accountdetails.ui" line="1697"/>
+ <location filename="../accountdetails.ui" line="1831"/>
<source>Max</source>
<translation>Максимально</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1839"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>Video RTP Port Range</source>
<translation>Порти для передачі відео по RTP</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1965"/>
+ <location filename="../accountdetails.ui" line="1896"/>
<source>Security</source>
<translation>Безпека</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2337"/>
+ <location filename="../accountdetails.ui" line="2115"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Шифрування медіа потоку (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2355"/>
+ <location filename="../accountdetails.ui" line="2180"/>
+ <source>Devices</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2224"/>
+ <source>Add device</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2251"/>
+ <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2267"/>
+ <source>Password (required)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2295"/>
+ <source>Cancel</source>
+ <translation>Відміна</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2321"/>
+ <source>Export on the Ring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2373"/>
+ <source>Your generated pin:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2386"/>
+ <source>PIN</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2396"/>
+ <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2415"/>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2440"/>
+ <source>Banned Contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2112"/>
<source>Encrypt media stream (SRTP)</source>
<translation>Шифрувати потік (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2022"/>
- <source>Negotiation Encryption</source>
- <translation>Шифрування розмови</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="1316"/>
+ <location filename="../accountdetails.ui" line="1247"/>
<source>Published Address</source>
<translation>Опублікована адреса</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2040"/>
- <source>Encrypt negotiation (TLS)</source>
- <translation>Шифрування переговорів (TLS)</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="2124"/>
+ <location filename="../accountdetails.ui" line="1961"/>
<source>CA certificate</source>
<translation>CA сертифікат</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2161"/>
+ <location filename="../accountdetails.ui" line="1998"/>
<source>User certificate</source>
<translation>Сертифікат користувача</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2195"/>
+ <location filename="../accountdetails.ui" line="2032"/>
<source>Private key</source>
<translation>Приватний ключ</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2210"/>
+ <location filename="../accountdetails.ui" line="2047"/>
<source>Private key password</source>
<translation>Пароль від приватного ключа</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2073"/>
- <source>Verify incoming certificates (server side)</source>
- <translation>Перевірити вхідні сертифікати(на стороні сервера)</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="2103"/>
- <source>Verify answer certificates (client side)</source>
- <translation>Підтвердження сертифікатів безпеки (на стороні клієнта)</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="2088"/>
- <source>Require a certificate for incoming TLS connections</source>
- <translation>Вимагати сертифікат безпеки для вхідних TLS з’єднань</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="2269"/>
+ <location filename="../accountdetails.ui" line="2127"/>
<source>Use default ciphers</source>
<translation>Використовувати шифрувальники за замовчуванням</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="54"/>
+ <location filename="../accountdetails.cpp" line="55"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="242"/>
+ <location filename="../accountdetails.cpp" line="101"/>
+ <source>RingID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.cpp" line="229"/>
<source>Choose File</source>
<translation>Вибрати файл</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="244"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Files (*)</source>
<translation>Файли (*)</translation>
</message>
+ <message>
+ <location filename="../accountdetails.cpp" line="304"/>
+ <source>Please wait while your PIN is generated.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.cpp" line="323"/>
+ <source>Network Error. Please try again later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.cpp" line="327"/>
+ <source>Wrong password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.cpp" line="354"/>
+ <source>Registering... It may take some time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>BannedContactsWidget</name>
+ <message>
+ <location filename="../bannedcontactswidget.ui" line="20"/>
+ <source>Form</source>
+ <translation>Форма</translation>
+ </message>
+ <message>
+ <location filename="../bannedcontactswidget.ui" line="66"/>
+ <source>Banned ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../bannedcontactswidget.ui" line="98"/>
+ <source>Deban contact, and add to contact list</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>CallUtilsDialog</name>
<message>
- <location filename="../callutilsdialog.ui" line="14"/>
- <source>Dialog</source>
- <translation>Діалог</translation>
- </message>
- <message>
<location filename="../callutilsdialog.ui" line="65"/>
<source>or type number...</source>
<translation>або введіть номер...</translation>
@@ -390,181 +455,182 @@
<context>
<name>CallWidget</name>
<message>
- <location filename="../callwidget.ui" line="20"/>
- <source>Form</source>
- <translation>Форма</translation>
- </message>
- <message>
- <location filename="../callwidget.ui" line="197"/>
+ <location filename="../callwidget.ui" line="213"/>
<source>Search contacts or enter ring ID</source>
<translation>Знайти контакти або ввести ID</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="556"/>
+ <location filename="../callwidget.ui" line="324"/>
+ <source>Conversations</source>
+ <translation>Групові чати</translation>
+ </message>
+ <message>
+ <location filename="../callwidget.ui" line="375"/>
+ <source>Contact requests</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../callwidget.ui" line="545"/>
<source>settings menu</source>
<translation>налаштування меню</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="638"/>
- <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
- <translation>Ring - це захищена платформа для здійснення голосових та відеозвінків, яка не потребує централізованого сервера й надає самим користувачам можливість забезпечувати приватність</translation>
+ <location filename="../callwidget.ui" line="627"/>
+ <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../callwidget.ui" line="670"/>
+ <location filename="../callwidget.ui" line="659"/>
<source><html><head/><body><p align="center"><span style=" font-size:10pt; color:#aeaeae;">This is your RingID.</span></p><p align="center"><span style=" font-size:10pt; color:#aeaeae;">Copy and share it with your friends!</span></p></body></html></source>
<translation><html><head/><body><p align="center"><span style=" font-size:10pt; color:#aeaeae;">Це ваше RingID.</span></p><p align="center"><span style=" font-size:10pt; color:#aeaeae;">Зкопіювати та поділитися ним з ващими друзями!</span></p></body></html></translation>
</message>
<message>
- <location filename="../callwidget.ui" line="774"/>
+ <location filename="../callwidget.ui" line="763"/>
<source>Share your ring id</source>
<translation>Поділитися вашим ring id</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="829"/>
+ <location filename="../callwidget.ui" line="866"/>
<source><html><head/><body><p align="center"><span style=" color:#aeaeae;">Double-click to copy.</span></p></body></html></source>
<translation><html><head/><body><p align="center"><span style=" color:#aeaeae;">Подвійни клік для копіювання.</span></p></body></html></translation>
</message>
<message>
- <location filename="../callwidget.ui" line="842"/>
+ <location filename="../callwidget.ui" line="895"/>
<source>Error while generating QR Code</source>
<translation>Помилка при генерації QR-коду</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="944"/>
+ <location filename="../callwidget.ui" line="1067"/>
+ <source>contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../callwidget.ui" line="1094"/>
<source>Conversation with</source>
<translation>Розмова з</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1027"/>
+ <location filename="../callwidget.ui" line="1177"/>
<source>Start the conversation !</source>
<translation>Почати розмову!</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1114"/>
+ <location filename="../callwidget.ui" line="1264"/>
<source>send message</source>
<translation>віпдправити повідомлення</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1240"/>
+ <location filename="../callwidget.ui" line="1390"/>
+ <source>BestId</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../callwidget.ui" line="1400"/>
<source>Wants to talk to you!</source>
<translation>Хоче поговорити з вами!</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1335"/>
+ <location filename="../callwidget.ui" line="1495"/>
<source>Answer</source>
<translation>Відповідь</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1367"/>
+ <location filename="../callwidget.ui" line="1527"/>
<source>Ignore</source>
<translation>Ігнорувати</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1438"/>
+ <location filename="../callwidget.ui" line="1598"/>
<source>Calling</source>
<translation>Дзвінок</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1492"/>
+ <location filename="../callwidget.ui" line="1671"/>
<source>Cancel</source>
<translation>Відміна</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1230"/>
+ <location filename="../callwidget.ui" line="1380"/>
<source>Call</source>
<translation>Дзвінок</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="150"/>
- <location filename="../callwidget.cpp" line="294"/>
+ <location filename="../callwidget.cpp" line="279"/>
<source>Copy number</source>
<translation>Копіювати номер</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="156"/>
- <location filename="../callwidget.cpp" line="300"/>
+ <location filename="../callwidget.cpp" line="290"/>
<source>Add to contact</source>
<translation>Додати до контактів</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="210"/>
- <source>Share by email</source>
- <translation>Поділитися за допомогою email</translation>
- </message>
- <message>
- <location filename="../callwidget.cpp" line="212"/>
+ <location filename="../callwidget.cpp" line="926"/>
<source>Contact me on Ring</source>
<translation>Зв'яжись зі мною за допомогою Ring</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="212"/>
+ <location filename="../callwidget.cpp" line="926"/>
<source>My RingId is : </source>
<translation>Моє RingId : </translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="215"/>
- <source>Show QRCode</source>
- <translation>Показати QR-код</translation>
- </message>
- <message>
- <location filename="../callwidget.cpp" line="229"/>
+ <location filename="../callwidget.cpp" line="212"/>
<source>Copy</source>
<translation>Копіювати</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="239"/>
+ <location filename="../callwidget.cpp" line="222"/>
<source>Display date</source>
<translation>Відобразити дату</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="243"/>
+ <location filename="../callwidget.cpp" line="226"/>
<source>Display author</source>
<translation>Відобразити автора</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="271"/>
+ <location filename="../callwidget.cpp" line="255"/>
<source>Message incoming from %1</source>
<translation>Вхідне повідомлення від %1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="310"/>
+ <location filename="../callwidget.cpp" line="284"/>
+ <source>Copy name</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../callwidget.cpp" line="300"/>
<source>Call Number</source>
<translation>Номер Виклику</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="311"/>
+ <location filename="../callwidget.cpp" line="301"/>
<source>Copy Number</source>
<translation>Зкопіювати Номер</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="314"/>
+ <location filename="../callwidget.cpp" line="304"/>
<source>Copy %1</source>
<translation>Зкопіювати %1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="319"/>
+ <location filename="../callwidget.cpp" line="309"/>
<source>Call %1</source>
<translation>Виклик %1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="349"/>
- <location filename="../callwidget.cpp" line="406"/>
+ <location filename="../callwidget.cpp" line="749"/>
<source>NO RING ACCOUNT FOUND</source>
<translation>АККАУНТ RING НЕ ЗНАЙДЕНО</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="431"/>
+ <location filename="../callwidget.cpp" line="414"/>
<source>Call incoming from %1</source>
<translation>Вхідний виклик від %1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="417"/>
- <source>%1</source>
- <comment>%1 is the name of the caller</comment>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../callwidget.cpp" line="694"/>
+ <location filename="../callwidget.cpp" line="784"/>
<source>Conversation with %1</source>
<comment>%1 is the contact name</comment>
<translation>Розмова з %1</translation>
@@ -618,6 +684,11 @@
<translation>Згортати вікно при закриванні</translation>
</message>
<message>
+ <location filename="../configurationwidget.ui" line="775"/>
+ <source>Check for updates now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../configurationwidget.ui" line="116"/>
<source>Video</source>
<translation>Відео</translation>
@@ -648,62 +719,62 @@
<translation>Завжди робити запис</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="681"/>
+ <location filename="../configurationwidget.ui" line="652"/>
+ <source>Enable notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../configurationwidget.ui" line="699"/>
<source>Check for update automatically every</source>
<translation>Перевіряти оновлення автоматично кожні</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="709"/>
+ <location filename="../configurationwidget.ui" line="736"/>
<source>days</source>
<translation>днів</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="736"/>
- <source>Check for updates</source>
- <translation>Перевірити оновлення</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="849"/>
+ <location filename="../configurationwidget.ui" line="888"/>
<source>Preview unavailable during call</source>
<translation>Попередній перегляд не доступний від час виклику</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="903"/>
+ <location filename="../configurationwidget.ui" line="942"/>
<source>Device Selection</source>
<translation>Вибір пристрою</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="961"/>
+ <location filename="../configurationwidget.ui" line="1000"/>
<source>Device</source>
<translation>Пристрій</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="992"/>
+ <location filename="../configurationwidget.ui" line="1031"/>
<source>Resolution</source>
<translation>Роздільна здатність</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1029"/>
+ <location filename="../configurationwidget.ui" line="1068"/>
<source>Output Device</source>
<translation>Пристрій Виведення</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1044"/>
+ <location filename="../configurationwidget.ui" line="1083"/>
<source>Input Device</source>
<translation>Пристрій Введення</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1141"/>
+ <location filename="../configurationwidget.ui" line="1180"/>
<source>add new account</source>
<translation>додати новий контакт</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1168"/>
+ <location filename="../configurationwidget.ui" line="1242"/>
<source>Import</source>
<translation>Імпортувати</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1175"/>
+ <location filename="../configurationwidget.ui" line="1249"/>
<source>Export</source>
<translation>Експортувати</translation>
</message>
@@ -713,17 +784,17 @@
<translation>Аккаунт</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="661"/>
+ <location filename="../configurationwidget.ui" line="676"/>
<source>Launch Ring on Startup</source>
<translation>Завантажувати Ring разом з системою</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="303"/>
+ <location filename="../configurationwidget.cpp" line="310"/>
<source>New Account</source>
<translation>Новий аккаунт</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="324"/>
+ <location filename="../configurationwidget.cpp" line="330"/>
<source>Are you sure you want to clear all your history?</source>
<translation>Ви все ще бажаєте очистити історію?</translation>
</message>
@@ -739,14 +810,6 @@
</message>
</context>
<context>
- <name>ContactDelegate</name>
- <message>
- <location filename="../contactdelegate.cpp" line="87"/>
- <source><Multiple contact methods></source>
- <translation><Дії з багатьма контактами></translation>
- </message>
-</context>
-<context>
<name>ContactPicker</name>
<message>
<location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
</message>
</context>
<context>
+ <name>ContactRequestWidget</name>
+ <message>
+ <location filename="../contactrequestwidget.ui" line="14"/>
+ <source>Form</source>
+ <translation>Форма</translation>
+ </message>
+ <message>
+ <location filename="../contactrequestwidget.ui" line="28"/>
+ <source>Incoming Contact Request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../contactrequestwidget.ui" line="87"/>
+ <source>nameLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../contactrequestwidget.ui" line="103"/>
+ <source>bestIdLabel</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../contactrequestwidget.ui" line="129"/>
+ <source>Accept</source>
+ <translation>Прийняти</translation>
+ </message>
+ <message>
+ <location filename="../contactrequestwidget.ui" line="152"/>
+ <source>Discard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../contactrequestwidget.ui" line="175"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>CurrentAccountWidget</name>
+ <message>
+ <location filename="../currentaccountwidget.ui" line="26"/>
+ <source>Form</source>
+ <translation>Форма</translation>
+ </message>
+</context>
+<context>
+ <name>DeleteAccountDialog</name>
+ <message>
+ <location filename="../deleteaccountdialog.ui" line="14"/>
+ <source>Ring - account deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../deleteaccountdialog.ui" line="33"/>
+ <source>Do you realy want to delete account ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../deleteaccountdialog.ui" line="66"/>
+ <source>This action is irrevocable</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../deleteaccountdialog.ui" line="73"/>
+ <source>If this account hasn't been exported, or added to another device, it will be lost</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../deleteaccountdialog.ui" line="138"/>
+ <source>Cancel</source>
+ <translation>Відміна</translation>
+ </message>
+ <message>
+ <location filename="../deleteaccountdialog.ui" line="164"/>
+ <source>Ok</source>
+ <translation>Ок</translation>
+ </message>
+</context>
+<context>
<name>InstantMessagingWidget</name>
<message>
<location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
<translation>Ring</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="57"/>
+ <location filename="../mainwindow.cpp" line="53"/>
<source>Configuration</source>
<translation>Конфігурація</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="60"/>
+ <location filename="../mainwindow.cpp" line="56"/>
<source>Exit</source>
<translation>Вийти</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="84"/>
+ <location filename="../mainwindow.cpp" line="80"/>
<source>About</source>
<translation>Про программу</translation>
</message>
@@ -899,31 +1041,42 @@
<source>No default mail client found</source>
<translation>Не знайдено жодного поштового клієнту</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="35"/>
+ <source>Ring account</source>
+ <comment>Default alias for new Ring account</comment>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>QualityDialog</name>
<message>
- <location filename="../qualitydialog.ui" line="14"/>
- <source>Dialog</source>
- <translation>Діалог</translation>
- </message>
- <message>
<location filename="../qualitydialog.ui" line="100"/>
<source>Auto</source>
<translation>Авто</translation>
</message>
</context>
<context>
- <name>RingButton</name>
+ <name>SendContactRequestWidget</name>
<message>
- <location filename="../ringbutton.ui" line="26"/>
+ <location filename="../sendcontactrequestwidget.ui" line="14"/>
<source>Form</source>
<translation>Форма</translation>
</message>
<message>
- <location filename="../ringbutton.ui" line="69"/>
- <source>TextLabel</source>
- <translation>Текстове поле</translation>
+ <location filename="../sendcontactrequestwidget.ui" line="26"/>
+ <source>ContactID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../sendcontactrequestwidget.ui" line="39"/>
+ <source>TODO: Explain the purpose of a contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../sendcontactrequestwidget.ui" line="78"/>
+ <source>Send contact request</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -969,22 +1122,22 @@
<translation>Приєднати виклики</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="473"/>
+ <location filename="../videooverlay.ui" line="490"/>
<source>Name label</source>
<translation>Назва етикетки</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="495"/>
+ <location filename="../videooverlay.ui" line="512"/>
<source>Add to contact</source>
<translation>Додати до контактів</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="565"/>
+ <location filename="../videooverlay.ui" line="582"/>
<source>Time elapsed</source>
<translation>Витрачено часу</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="568"/>
+ <location filename="../videooverlay.ui" line="585"/>
<source>00:00</source>
<translation>00:00</translation>
</message>
@@ -1002,17 +1155,17 @@
<context>
<name>VideoView</name>
<message>
- <location filename="../videoview.cpp" line="232"/>
+ <location filename="../videoview.cpp" line="235"/>
<source>Share entire screen</source>
<translation>Поділитися частиною екрану</translation>
</message>
<message>
- <location filename="../videoview.cpp" line="235"/>
+ <location filename="../videoview.cpp" line="238"/>
<source>Share screen area</source>
<translation>Поділитися екраном</translation>
</message>
<message>
- <location filename="../videoview.cpp" line="242"/>
+ <location filename="../videoview.cpp" line="245"/>
<source>Share file</source>
<translation>Відправити файл</translation>
</message>
@@ -1020,23 +1173,150 @@
<context>
<name>WizardDialog</name>
<message>
- <location filename="../wizarddialog.cpp" line="58"/>
- <source>Please wait while we create your account.</source>
- <translation>Почекайте пока ваш аккаунт створюється.</translation>
+ <location filename="../wizarddialog.cpp" line="69"/>
+ <source>Your account needs to be migrated. Choose a password.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../wizarddialog.cpp" line="74"/>
+ <location filename="../wizarddialog.cpp" line="105"/>
+ <source>Migrating your Ring account...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="125"/>
<source>Unknown</source>
<translation>Невідомий</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="124"/>
+ <location filename="../wizarddialog.cpp" line="159"/>
+ <source>Registering your public username, it may take a few minutes...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="220"/>
+ <source>Add a device</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="323"/>
+ <source>Username not available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="326"/>
+ <source>Username is available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="329"/>
+ <source>Username is invalid.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="332"/>
+ <source>Network error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="85"/>
+ <source>Create Ring account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="98"/>
+ <source>Link this device to an account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="127"/>
+ <source>How to add a device</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="134"/>
+ <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">To link this device to another account, you first </span><span style=" font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-size:12pt;"> code. To generate the PIN code:</span></p>
+<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li>
+<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li>
+<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li>
+<li style=" font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-size:12pt;">.</span></p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="159"/>
+ <source>Create your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="244"/>
+ <source>Enter your full name:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="297"/>
+ <location filename="../wizarddialog.cpp" line="223"/>
+ <source>Create your account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>Choose your username:</source>
<translation>Оберіть ваш логін:</translation>
</message>
<message>
- <location filename="../wizarddialog.ui" line="195"/>
- <location filename="../wizarddialog.ui" line="198"/>
+ <location filename="../wizarddialog.ui" line="370"/>
+ <source>Choose your username</source>
+ <translation>Оберіть ваше ім'я користувача</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="386"/>
+ <location filename="../wizarddialog.cpp" line="295"/>
+ <source>Searching...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="395"/>
+ <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="398"/>
+ <source>Register public username (experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="425"/>
+ <source>Enter your pin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="455"/>
+ <source>Password</source>
+ <translation>Пароль</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="485"/>
+ <source>Confirm password</source>
+ <translation>Підтвердити пароль</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="553"/>
+ <location filename="../wizarddialog.cpp" line="107"/>
+ <source>Generating your Ring account...</source>
+ <translation>Генерація вашого облікового запису Ring...</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="589"/>
+ <source>Previous</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="621"/>
+ <location filename="../wizarddialog.ui" line="624"/>
<source>Next</source>
<translation>Наступний</translation>
</message>