i18n: automatic bump
Change-Id: I5ce22de2417369ab1ec1799b0cc56fee3e542d30
diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts
index 72fe2db..cc582f9 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.0">
<context>
<name>AboutDialog</name>
<message>
@@ -13,39 +13,34 @@
<translation>Krediteringer</translation>
</message>
<message>
- <location filename="../aboutdialog.ui" line="554"/>
- <source>Release : Louis-Joseph Papineau</source>
- <translation>Udgivelse : Louis-Joseph Papineau</translation>
+ <location filename="../aboutdialog.ui" line="541"/>
+ <source>Release : Beta 2 - Gaston Miron</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.ui" line="570"/>
+ <location filename="../aboutdialog.ui" line="557"/>
<source>The Microsoft Windows client for Ring.
Ring is a secured and distributed communication software.</source>
<translation>Microsoft Windows klient til Ring.
Ring er software til sikker og distribueret kommunikation.</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>version</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="40"/>
+ <location filename="../aboutdialog.cpp" line="37"/>
<source>Created by:</source>
<translation>Skabt af:</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="52"/>
+ <location filename="../aboutdialog.cpp" line="67"/>
<source>Artwork by:</source>
<translation>Grafik af:</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="56"/>
+ <location filename="../aboutdialog.cpp" line="71"/>
<source>Based on the SFLPhone project</source>
<translation>Baseret på SFLPhone-projektet</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>Indstillinger</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="60"/>
+ <location filename="../accountdetails.ui" line="63"/>
<source>General</source>
<translation>Generelt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="175"/>
+ <location filename="../accountdetails.ui" line="137"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="238"/>
+ <location filename="../accountdetails.ui" line="197"/>
<source>Type</source>
<translation>Type</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="204"/>
+ <location filename="../accountdetails.ui" line="163"/>
<source>Alias</source>
<translation>Alias</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="308"/>
+ <location filename="../accountdetails.ui" line="241"/>
<source>Parameters</source>
<translation>Parametre</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="341"/>
+ <location filename="../accountdetails.ui" line="271"/>
<source>Hostname</source>
<translation>Værtsnavn</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>Brugernavn</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>Kodeord</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="127"/>
- <source>delete account</source>
- <translation>slet konto</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="424"/>
+ <location filename="../accountdetails.ui" line="488"/>
<source>Proxy</source>
<translation>Stedfortræder</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="464"/>
+ <location filename="../accountdetails.ui" line="528"/>
<source>Voicemail number</source>
<translation>Telefonsvarernummer</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="498"/>
+ <location filename="../accountdetails.ui" line="562"/>
<source>Auto-answer calls</source>
<translation>Svar automatisk opkald</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="516"/>
+ <location filename="../accountdetails.ui" line="580"/>
<source>UPnP enabled</source>
<translation>UPnP aktiveret</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="531"/>
- <source>DTMF tone type</source>
- <translation>DTMF-tone type</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>Tillad Opkald Fra Ukendt</translation>
+ <translation>Tillad opkald fra ukendt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="726"/>
+ <location filename="../accountdetails.ui" line="665"/>
<source>Allow Call From Contact</source>
- <translation>Tillad Opkald Fra Kontakt</translation>
+ <translation>Tillad opkald fra kontakt</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="714"/>
+ <location filename="../accountdetails.ui" line="653"/>
<source>Allow Call From History</source>
- <translation>Tillad Opkald Fra Historik</translation>
+ <translation>Tillad opkald fra historik</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>Navne-service URL</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="611"/>
<source>Ring Account Settings</source>
<translation>Ring-konto Indstillinger</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="772"/>
+ <location filename="../accountdetails.ui" line="701"/>
<source>Ringtone Selection</source>
<translation>Ringetone-valg</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>Afspil</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="854"/>
+ <location filename="../accountdetails.ui" line="785"/>
<source>Audio/Video</source>
<translation>Lyd/video</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1070"/>
+ <location filename="../accountdetails.ui" line="1001"/>
<source>Audio codecs</source>
<translation>Audio-codec'er</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1100"/>
+ <location filename="../accountdetails.ui" line="1031"/>
<source>Video codecs</source>
<translation>Video-codec'er</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1117"/>
+ <location filename="../accountdetails.ui" line="1048"/>
<source>Advanced</source>
<translation>Avanceret</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1163"/>
+ <location filename="../accountdetails.ui" line="1094"/>
<source>Registration</source>
<translation>Registrering</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1183"/>
+ <location filename="../accountdetails.ui" line="1114"/>
<source>Registration expire timeout (seconds):</source>
<translation>Tidsgrænse for registrering (sekunder):</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1221"/>
+ <location filename="../accountdetails.ui" line="1152"/>
<source>Network Interface</source>
<translation>Netværksinterface</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1242"/>
+ <location filename="../accountdetails.ui" line="1173"/>
<source>Local Port:</source>
<translation>Lokal-port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1346"/>
+ <location filename="../accountdetails.ui" line="1277"/>
<source>Same as local parameters</source>
<translation>Samme som lokale parametre</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1367"/>
+ <location filename="../accountdetails.ui" line="1298"/>
<source>Set published address and port:</source>
<translation>Sæt offentliggjorte adresse og port:</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1393"/>
+ <location filename="../accountdetails.ui" line="1324"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1424"/>
+ <location filename="../accountdetails.ui" line="1355"/>
<source>Port</source>
<translation>Port</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1478"/>
+ <location filename="../accountdetails.ui" line="1409"/>
<source>Use STUN</source>
<translation>Brug 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>Server-URL</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1519"/>
+ <location filename="../accountdetails.ui" line="1450"/>
<source>Use TURN</source>
<translation>Brug TURN</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1586"/>
+ <location filename="../accountdetails.ui" line="1517"/>
<source>Realm</source>
<translation>Realm</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1635"/>
+ <location filename="../accountdetails.ui" line="1566"/>
<source>SDP Session Negotiation (ICE Fallback)</source>
<translation>SDP Sessions-forhandling (ICE-tilbagefald)</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>Disse indstillinger bruges kun under SDP-sessiinsforhandling hvis ICE ikke understøttes af serveren eller modparten.</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1705"/>
+ <location filename="../accountdetails.ui" line="1636"/>
<source>Audio RTP Port Range</source>
<translation>Portinterval for Lyd-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>Min</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>Maks</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1839"/>
+ <location filename="../accountdetails.ui" line="1770"/>
<source>Video RTP Port Range</source>
<translation>Video RTP-port Interval</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="1965"/>
+ <location filename="../accountdetails.ui" line="1896"/>
<source>Security</source>
<translation>Sikkerhed</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2337"/>
+ <location filename="../accountdetails.ui" line="2115"/>
<source>Media Stream Encryption (SRTP)</source>
<translation>Mediestrøm kryptering (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2355"/>
+ <location filename="../accountdetails.ui" line="2180"/>
+ <source>Devices</source>
+ <translation>Enheder</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2224"/>
+ <source>Add device</source>
+ <translation>Tilføj enhed</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2251"/>
+ <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
+ <translation>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="2267"/>
+ <source>Password (required)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2295"/>
+ <source>Cancel</source>
+ <translation>Annuller</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2321"/>
+ <source>Export on the Ring</source>
+ <translation>Eksporter til Ring</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2373"/>
+ <source>Your generated pin:</source>
+ <translation>Din genererede PIN-kode:</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2386"/>
+ <source>PIN</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2396"/>
+ <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../accountdetails.ui" line="2415"/>
+ <source>OK</source>
+ <translation>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>Kryptér mediastrøm (SRTP)</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2022"/>
- <source>Negotiation Encryption</source>
- <translation>Forhandlingskryptering</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="1316"/>
+ <location filename="../accountdetails.ui" line="1247"/>
<source>Published Address</source>
<translation>Publiceret Adresse</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2040"/>
- <source>Encrypt negotiation (TLS)</source>
- <translation>Krypter forhandling (TLS)</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="2124"/>
+ <location filename="../accountdetails.ui" line="1961"/>
<source>CA certificate</source>
<translation>CA-certifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2161"/>
+ <location filename="../accountdetails.ui" line="1998"/>
<source>User certificate</source>
<translation>Bruger-certifikat</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2195"/>
+ <location filename="../accountdetails.ui" line="2032"/>
<source>Private key</source>
<translation>Privat nøgle</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2210"/>
+ <location filename="../accountdetails.ui" line="2047"/>
<source>Private key password</source>
<translation>Kodeord til privat nøgle</translation>
</message>
<message>
- <location filename="../accountdetails.ui" line="2073"/>
- <source>Verify incoming certificates (server side)</source>
- <translation>Verificer indgående certifikater (på server-siden)</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="2103"/>
- <source>Verify answer certificates (client side)</source>
- <translation>Verificer svar-certifikater (på klient-siden)</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="2088"/>
- <source>Require a certificate for incoming TLS connections</source>
- <translation>Kræv certifikat for indgående TLS-forbindelser</translation>
- </message>
- <message>
- <location filename="../accountdetails.ui" line="2269"/>
+ <location filename="../accountdetails.ui" line="2127"/>
<source>Use default ciphers</source>
<translation>Brug standard-cifre</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="54"/>
+ <location filename="../accountdetails.cpp" line="55"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="242"/>
+ <location filename="../accountdetails.cpp" line="101"/>
+ <source>RingID</source>
+ <translation>RingID</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.cpp" line="229"/>
<source>Choose File</source>
<translation>Vælg fil</translation>
</message>
<message>
- <location filename="../accountdetails.cpp" line="244"/>
+ <location filename="../accountdetails.cpp" line="231"/>
<source>Files (*)</source>
<translation>Filer (*)</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>Forkert kodeord.</translation>
+ </message>
+ <message>
+ <location filename="../accountdetails.cpp" line="354"/>
+ <source>Registering... It may take some time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>BannedContactsWidget</name>
+ <message>
+ <location filename="../bannedcontactswidget.ui" line="20"/>
+ <source>Form</source>
+ <translation>Form</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>Dialog</translation>
- </message>
- <message>
<location filename="../callutilsdialog.ui" line="65"/>
<source>or type number...</source>
<translation>eller angiv nummer...</translation>
@@ -390,181 +455,182 @@
<context>
<name>CallWidget</name>
<message>
- <location filename="../callwidget.ui" line="20"/>
- <source>Form</source>
- <translation>Form</translation>
- </message>
- <message>
- <location filename="../callwidget.ui" line="197"/>
+ <location filename="../callwidget.ui" line="213"/>
<source>Search contacts or enter ring ID</source>
<translation>Søg kontakter eller angiv Ring-ID</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="556"/>
+ <location filename="../callwidget.ui" line="324"/>
+ <source>Conversations</source>
+ <translation>Samtaler</translation>
+ </message>
+ <message>
+ <location filename="../callwidget.ui" line="375"/>
+ <source>Contact requests</source>
+ <translation>Kontaktforespørgsler</translation>
+ </message>
+ <message>
+ <location filename="../callwidget.ui" line="545"/>
<source>settings menu</source>
<translation>indstillinger</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 er en sikker og distribueret tale, video og besked kommunikationsplatform, der ikke benytter en central server og som efterlader magten over privatlivet i brugerens hænder.</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>Ring er fri software til universel kommunikation som respekterer sine brugeres frihed og privatliv.</translation>
</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;">Dette er dit RingID.</span></p><p align="center"><span style=" font-size:10pt; color:#aeaeae;">Kopiér og del det med dine venner!</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>Del din 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;">Dobbel-klik for at kopiér.</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>Fejl ved generering af QR code</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>Samtale med</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1027"/>
+ <location filename="../callwidget.ui" line="1177"/>
<source>Start the conversation !</source>
<translation>Start samtalen!</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1114"/>
+ <location filename="../callwidget.ui" line="1264"/>
<source>send message</source>
<translation>send besked</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>Vil tale med dig!</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1335"/>
+ <location filename="../callwidget.ui" line="1495"/>
<source>Answer</source>
<translation>Besvar</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1367"/>
+ <location filename="../callwidget.ui" line="1527"/>
<source>Ignore</source>
<translation>Afvis</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1438"/>
+ <location filename="../callwidget.ui" line="1598"/>
<source>Calling</source>
<translation>Ringer</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1492"/>
+ <location filename="../callwidget.ui" line="1671"/>
<source>Cancel</source>
<translation>Annuller</translation>
</message>
<message>
- <location filename="../callwidget.ui" line="1230"/>
+ <location filename="../callwidget.ui" line="1380"/>
<source>Call</source>
<translation>Ring op</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>Kopier nummer</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>Føj til kontakt</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="210"/>
- <source>Share by email</source>
- <translation>Del via email</translation>
- </message>
- <message>
- <location filename="../callwidget.cpp" line="212"/>
+ <location filename="../callwidget.cpp" line="926"/>
<source>Contact me on Ring</source>
<translation>Kontakt mig på Ring</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="212"/>
+ <location filename="../callwidget.cpp" line="926"/>
<source>My RingId is : </source>
<translation>Min Ring-ID er:</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="215"/>
- <source>Show QRCode</source>
- <translation>Vis QR kode</translation>
- </message>
- <message>
- <location filename="../callwidget.cpp" line="229"/>
+ <location filename="../callwidget.cpp" line="212"/>
<source>Copy</source>
<translation>Kopiér</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="239"/>
+ <location filename="../callwidget.cpp" line="222"/>
<source>Display date</source>
<translation>Vis dato</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="243"/>
+ <location filename="../callwidget.cpp" line="226"/>
<source>Display author</source>
<translation>Vis forfatter</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="271"/>
+ <location filename="../callwidget.cpp" line="255"/>
<source>Message incoming from %1</source>
<translation>Besked ankommet fra %1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="310"/>
+ <location filename="../callwidget.cpp" line="284"/>
+ <source>Copy name</source>
+ <translation>Kopiér navn</translation>
+ </message>
+ <message>
+ <location filename="../callwidget.cpp" line="300"/>
<source>Call Number</source>
<translation>Ring til nummer</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="311"/>
+ <location filename="../callwidget.cpp" line="301"/>
<source>Copy Number</source>
<translation>Kopiér nummer</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="314"/>
+ <location filename="../callwidget.cpp" line="304"/>
<source>Copy %1</source>
<translation>Kopiér %1</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="319"/>
+ <location filename="../callwidget.cpp" line="309"/>
<source>Call %1</source>
<translation>Ring %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>INGEN RING KONTO FUNDET</translation>
</message>
<message>
- <location filename="../callwidget.cpp" line="431"/>
+ <location filename="../callwidget.cpp" line="414"/>
<source>Call incoming from %1</source>
<translation>Indgående kald fra %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>Samtale med %1</translation>
@@ -618,6 +684,11 @@
<translation>Hold minimeret ved lukning</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>Video</translation>
@@ -648,62 +719,62 @@
<translation>Optag altid</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>Søg efter opdateringer automatisk hver</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="709"/>
+ <location filename="../configurationwidget.ui" line="736"/>
<source>days</source>
<translation>dage</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="736"/>
- <source>Check for updates</source>
- <translation>Søg efter opdateringer</translation>
- </message>
- <message>
- <location filename="../configurationwidget.ui" line="849"/>
+ <location filename="../configurationwidget.ui" line="888"/>
<source>Preview unavailable during call</source>
<translation>Forhåndsvisning ikke tilgængelig under samtale</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="903"/>
+ <location filename="../configurationwidget.ui" line="942"/>
<source>Device Selection</source>
<translation>Enheds-valg</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="961"/>
+ <location filename="../configurationwidget.ui" line="1000"/>
<source>Device</source>
<translation>Enhed</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="992"/>
+ <location filename="../configurationwidget.ui" line="1031"/>
<source>Resolution</source>
<translation>Opløsning</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1029"/>
+ <location filename="../configurationwidget.ui" line="1068"/>
<source>Output Device</source>
<translation>Output Enhed</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1044"/>
+ <location filename="../configurationwidget.ui" line="1083"/>
<source>Input Device</source>
<translation>Input Enhed</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1141"/>
+ <location filename="../configurationwidget.ui" line="1180"/>
<source>add new account</source>
<translation>tilføj ny konto</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1168"/>
+ <location filename="../configurationwidget.ui" line="1242"/>
<source>Import</source>
<translation>Import</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="1175"/>
+ <location filename="../configurationwidget.ui" line="1249"/>
<source>Export</source>
<translation>Eksport</translation>
</message>
@@ -713,17 +784,17 @@
<translation>Konto</translation>
</message>
<message>
- <location filename="../configurationwidget.ui" line="661"/>
+ <location filename="../configurationwidget.ui" line="676"/>
<source>Launch Ring on Startup</source>
<translation>Start Ring ved opstart</translation>
</message>
<message>
- <location filename="../configurationwidget.cpp" line="303"/>
+ <location filename="../configurationwidget.cpp" line="310"/>
<source>New Account</source>
<translation>Ny konto</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>Er du sikker på at du vil slette al din historik?</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><Flere kontakt metoder></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>Form</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>Accepter</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>Blokér</translation>
+ </message>
+</context>
+<context>
+ <name>CurrentAccountWidget</name>
+ <message>
+ <location filename="../currentaccountwidget.ui" line="26"/>
+ <source>Form</source>
+ <translation>Form</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>Annuller</translation>
+ </message>
+ <message>
+ <location filename="../deleteaccountdialog.ui" line="164"/>
+ <source>Ok</source>
+ <translation>Ok</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>Konfiguration</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="60"/>
+ <location filename="../mainwindow.cpp" line="56"/>
<source>Exit</source>
<translation>Afslut</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="84"/>
+ <location filename="../mainwindow.cpp" line="80"/>
<source>About</source>
<translation>Om</translation>
</message>
@@ -899,31 +1041,42 @@
<source>No default mail client found</source>
<translation>Ingen standard mail klient fundet</translation>
</message>
+ <message>
+ <location filename="../wizarddialog.cpp" line="35"/>
+ <source>Ring account</source>
+ <comment>Default alias for new Ring account</comment>
+ <translation>Ring-konto</translation>
+ </message>
</context>
<context>
<name>QualityDialog</name>
<message>
- <location filename="../qualitydialog.ui" line="14"/>
- <source>Dialog</source>
- <translation>Dialog</translation>
- </message>
- <message>
<location filename="../qualitydialog.ui" line="100"/>
<source>Auto</source>
<translation>Auto</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>Form</translation>
</message>
<message>
- <location filename="../ringbutton.ui" line="69"/>
- <source>TextLabel</source>
- <translation>TekstLabel</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>Sammenføj samtaler</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="473"/>
+ <location filename="../videooverlay.ui" line="490"/>
<source>Name label</source>
<translation>Navne etiket</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="495"/>
+ <location filename="../videooverlay.ui" line="512"/>
<source>Add to contact</source>
<translation>Føj til kontakt</translation>
</message>
<message>
- <location filename="../videooverlay.ui" line="565"/>
+ <location filename="../videooverlay.ui" line="582"/>
<source>Time elapsed</source>
<translation>Tid gået</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>Del hele skærmen</translation>
</message>
<message>
- <location filename="../videoview.cpp" line="235"/>
+ <location filename="../videoview.cpp" line="238"/>
<source>Share screen area</source>
<translation>Del skærmområde</translation>
</message>
<message>
- <location filename="../videoview.cpp" line="242"/>
+ <location filename="../videoview.cpp" line="245"/>
<source>Share file</source>
<translation>Del fil</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>Vent venligst men vi opretter din konto.</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>Ukendt</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>Tilknyt denne enhed til en konto</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="127"/>
+ <source>How to add a device</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="134"/>
+ <source><!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>Opret din profil</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="244"/>
+ <source>Enter your full name:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="297"/>
+ <location filename="../wizarddialog.cpp" line="223"/>
+ <source>Create your account</source>
+ <translation>Opret din konto</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="322"/>
<source>Choose your username:</source>
<translation>Vælg dit brugernavn:</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>Vælg dit brugernavn</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>Registrer offentligt brugernavn (eksperimentel funktionalitet)</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="425"/>
+ <source>Enter your pin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="455"/>
+ <source>Password</source>
+ <translation>Kodeord</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="485"/>
+ <source>Confirm password</source>
+ <translation>Bekræft kodeord</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="553"/>
+ <location filename="../wizarddialog.cpp" line="107"/>
+ <source>Generating your Ring account...</source>
+ <translation>Genererer din Ring-konto...</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="589"/>
+ <source>Previous</source>
+ <translation>Tilbage</translation>
+ </message>
+ <message>
+ <location filename="../wizarddialog.ui" line="621"/>
+ <location filename="../wizarddialog.ui" line="624"/>
<source>Next</source>
<translation>Næste</translation>
</message>