diff --git a/po/ro.po b/po/ro.po
index 2bf0c90..5c7aa66 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-02 03:09-0400\n"
-"PO-Revision-Date: 2018-06-11 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-07-09 03:09-0400\n"
+"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"Last-Translator: Urmanschi Mihail <urmanschi.mihail@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/savoirfairelinux/ring/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,28 +25,40 @@
 msgid "_Quit"
 msgstr ""
 
-#: ui/choosecontactview.ui:34
-msgid "Create New"
-msgstr ""
-
-#: ui/accountmigrationview.ui:14
+#: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:39
-msgid "Alias:"
+#: ui/accountmigrationview.ui:31
+msgid "This account is malformed, please enter your password"
 msgstr ""
 
-#: ui/accountmigrationview.ui:102
-msgid "Please enter your password:"
+#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:620
+msgid "Alias"
+msgstr "Alias"
+
+#: ui/accountmigrationview.ui:126
+msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:129
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
+#: src/accountgeneraltab.cpp:707
+msgid "Password"
+msgstr "Parola"
+
+#: ui/accountmigrationview.ui:198
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:148
-msgid "Migration failed, wrong password ?"
+#: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
+#: ui/newaccountsettingsview.ui:876 src/accountmigrationview.cpp:176
+#: src/newaccountsettingsview.cpp:963
+msgid "Delete account"
+msgstr ""
+
+#: ui/accountmigrationview.ui:231
+msgid "Migration failed, wrong password?"
 msgstr ""
 
 #: ui/currentcallview.ui:251
@@ -138,15 +150,24 @@
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/accountgeneraltab.ui:507
+#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:105
+#: ui/accountcreationwizard.ui:90
+msgid "Advanced..."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:101
+msgid "Add a new SIP account"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:123
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:120
+#: ui/accountcreationwizard.ui:138
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -157,173 +178,168 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:146
+#: ui/accountcreationwizard.ui:164
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:174
+#: ui/accountcreationwizard.ui:192
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:193
+#: ui/accountcreationwizard.ui:211
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:217 ui/accountcreationwizard.ui:429
+#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:225 ui/accountcreationwizard.ui:437
+#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
 msgid "Next"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:267
+#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:287
-msgid "Full name:"
+#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:329
-msgid "Ring Account"
+#: ui/accountcreationwizard.ui:393
+msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:342
-msgid "Register public username (experimental):"
-msgstr ""
-
-#: ui/accountcreationwizard.ui:348
+#: ui/accountcreationwizard.ui:394
 msgid ""
 "By checking this, you will register a unique username on the Ring network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:371
-msgid "Password (confirm):"
-msgstr ""
+#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
+#: src/accountgeneraltab.cpp:697
+msgid "Username"
+msgstr "Nume de utilizator"
 
-#: ui/accountcreationwizard.ui:372
+#: ui/accountcreationwizard.ui:458
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:461
+#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+msgid "Confirm password"
+msgstr "Confirmă parola"
+
+#: ui/accountcreationwizard.ui:568
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:487 src/usernameregistrationbox.cpp:323
+#: ui/accountcreationwizard.ui:594
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:494
+#: ui/accountcreationwizard.ui:601
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:520
+#: ui/accountcreationwizard.ui:627
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:546
+#: ui/accountcreationwizard.ui:653
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:551 ui/accountgeneraltab.ui:589
-#: ui/accountgeneraltab.ui:611
+#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:44
-msgid "Profile Settings"
-msgstr ""
-
-#: ui/generalsettingsview.ui:86
+#: ui/generalsettingsview.ui:46
 msgid "Ring Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:62
 msgid "Start Ring on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:70
 msgid "Show Ring icon in the notification area (systray)."
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
+#: ui/generalsettingsview.ui:78
 msgid "Bring Ring to the foreground on incoming calls."
 msgstr ""
 
-#: ui/generalsettingsview.ui:126
+#: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
 msgstr ""
 
-#: ui/generalsettingsview.ui:134
+#: ui/generalsettingsview.ui:94
 msgid "Enable notifications for new chat messages."
 msgstr ""
 
-#: ui/generalsettingsview.ui:142
+#: ui/generalsettingsview.ui:102
 msgid "Show images and videos in chat window."
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:110
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:163
+#: ui/generalsettingsview.ui:123
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:190
+#: ui/generalsettingsview.ui:150
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:196
+#: ui/generalsettingsview.ui:156
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:220
+#: ui/generalsettingsview.ui:180
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:238
+#: ui/generalsettingsview.ui:198
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:259
+#: ui/generalsettingsview.ui:219
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:269
+#: ui/generalsettingsview.ui:229
 msgid "Clear all history"
 msgstr ""
 
-#: ui/ringmainwindow.ui:61
+#: ui/ringmainwindow.ui:56
 msgid "Menu"
 msgstr ""
 
-#: ui/ringmainwindow.ui:83
+#: ui/ringmainwindow.ui:78
 msgid "General"
 msgstr "General"
 
-#: ui/ringmainwindow.ui:98
+#: ui/ringmainwindow.ui:93
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:114
-msgid "Accounts"
-msgstr "Conturi"
-
-#: ui/ringmainwindow.ui:157
+#: ui/ringmainwindow.ui:145
 msgid "Settings"
 msgstr "Setari"
 
-#: ui/ringmainwindow.ui:267 ui/ringmainwindow.ui:274
+#: ui/ringmainwindow.ui:265 ui/ringmainwindow.ui:272
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:300 ui/ringmainwindow.ui:307
+#: ui/ringmainwindow.ui:298 ui/ringmainwindow.ui:305
 msgid "Contact requests"
 msgstr "Solicitări de contact"
 
@@ -375,167 +391,280 @@
 msgid "Enable hardware decoding:"
 msgstr ""
 
-#: ui/accountview.ui:42 ui/accountview.ui:45
-msgid "Remove selected account"
+#: ui/newaccountsettingsview.ui:15
+msgid "Add device"
 msgstr ""
 
-#: ui/accountview.ui:63 ui/accountview.ui:66
-msgid "Add new account"
+#: ui/newaccountsettingsview.ui:131
+msgid "Add New Device"
 msgstr ""
 
-#: ui/accountview.ui:75 ui/accountview.ui:78
-msgid "Select account type"
+#: ui/newaccountsettingsview.ui:146
+msgid ""
+"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."
 msgstr ""
 
-#: ui/accountvideotab.ui:50
-msgid "Enable Video"
-msgstr "Activează video"
-
-#: ui/accountvideotab.ui:80 ui/accountaudiotab.ui:57
-msgid "Up"
-msgstr "Sus"
-
-#: ui/accountvideotab.ui:87 ui/accountaudiotab.ui:64
-msgid "Down"
-msgstr "Jos"
-
-#: ui/accountvideotab.ui:98
-msgid "Video Codecs"
+#: ui/newaccountsettingsview.ui:155
+msgid "Password (required):"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:93
-msgid "Auto-answer and UPnP"
+#: ui/newaccountsettingsview.ui:166
+msgid "Enter archive password"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:129
-msgid "Registration expire timeout (seconds):"
+#: ui/newaccountsettingsview.ui:189
+msgid "Export on the Ring"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:151
-msgid "Allow calls from unknown peers"
+#: ui/newaccountsettingsview.ui:210
+msgid "Exporting account on the Ring..."
 msgstr ""
 
-#: ui/accountadvancedtab.ui:165
-msgid "Allow calls from peers in your call history"
+#: ui/newaccountsettingsview.ui:235
+msgid "Your generated pin:"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:179
-msgid "Allow calls from peers in your contacts list"
+#: ui/newaccountsettingsview.ui:460
+msgid "ID"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:197
-msgid "Registration"
+#: ui/newaccountsettingsview.ui:538
+msgid "Click to change password"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:226
-msgid "Use random port"
+#: ui/newaccountsettingsview.ui:566
+msgid "Export account"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:247
-msgid "Local port:"
+#: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:908
+msgid "Enable account"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:273
-msgid "Network Interface"
+#: ui/newaccountsettingsview.ui:697
+msgid "SIP server"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:301
-msgid "Same as local parameters"
-msgstr ""
-
-#: ui/accountadvancedtab.ui:316
-msgid "Set published address and port:"
-msgstr ""
-
-#: ui/accountadvancedtab.ui:340
-msgid "Address"
-msgstr ""
-
-#: ui/accountadvancedtab.ui:362 src/accountadvancedtab.cpp:606
-msgid "Port"
-msgstr ""
-
-#: ui/accountadvancedtab.ui:388
-msgid "Use STUN"
-msgstr ""
-
-#: ui/accountadvancedtab.ui:411 ui/accountadvancedtab.ui:460
-#: ui/accountadvancedtab.ui:575
-msgid "server URL"
-msgstr ""
-
-#: ui/accountadvancedtab.ui:437
-msgid "Use TURN"
-msgstr ""
-
-#: ui/accountadvancedtab.ui:482
-msgid "username"
-msgstr ""
-
-#: ui/accountadvancedtab.ui:503
+#: ui/newaccountsettingsview.ui:781
 msgid "password"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:527
-msgid "realm"
+#: ui/newaccountsettingsview.ui:812 ui/newaccountsettingsview.ui:1409
+#: src/accountgeneraltab.cpp:726
+msgid "Proxy"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:552
-msgid "Use Proxy"
+#: ui/newaccountsettingsview.ui:848
+msgid "Voicemail"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:605
-msgid "Published Address"
+#: ui/newaccountsettingsview.ui:959
+msgid "Known devices linked to this Ring account"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:633
-msgid "Bootstrap Servers"
+#: ui/newaccountsettingsview.ui:967
+msgid "Link another device"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:690
-msgid ""
-"These settings are only used during SDP session negotiation in case ICE is "
-"not supported by the server or peer."
+#: ui/newaccountsettingsview.ui:1032
+msgid "Banned contacts"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:715 ui/accountadvancedtab.ui:791
-msgid "Min"
+#: ui/newaccountsettingsview.ui:1088
+msgid "Advanced settings"
+msgstr "Setări avansate"
+
+#: ui/newaccountsettingsview.ui:1128
+msgid "General settings"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:738 ui/accountadvancedtab.ui:814
-msgid "Max"
+#: ui/newaccountsettingsview.ui:1146
+msgid "Call settings"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:762
-msgid "Audio RTP Port Range"
+#: ui/newaccountsettingsview.ui:1184
+msgid "Allow call from untrusted peers"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:838
-msgid "Video RTP Port Range"
+#: ui/newaccountsettingsview.ui:1219
+msgid "Auto answer calls"
 msgstr ""
 
-#: ui/accountadvancedtab.ui:856
+#: ui/newaccountsettingsview.ui:1255
+msgid "Custom ringtone"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1299
+msgid "Name server"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1336 ui/newaccountsettingsview.ui:2489
+msgid "Address"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1370
+msgid "OpenDHT configuration"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1454
+msgid "Bootstrap"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1514
+msgid "Encrypt media streams (SRTP)"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1549
+msgid "Enable SDES for key exchange protocol"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1585
+msgid "Fallback on RTP on encryption failure"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1620
+msgid "Encrypt negotiation (TLS)"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1655
+msgid "CA certificate"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1691
+msgid "User certificate"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1727
+msgid "Private key"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1763
+msgid "Private key password"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1801
+msgid "TLS protocol method"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1837
+msgid "Outgoing TLS server name"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1872
+msgid "Negotiation timeout (seconds)"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1908
+msgid "Verify incoming certificates (server side)"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1943
+msgid "Verify answer certificates (client side)"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:1978
+msgid "Require a certificate for incoming TLS connections"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2002
+msgid "Security"
+msgstr "Seuritate"
+
+#: ui/newaccountsettingsview.ui:2027
+msgid "Connectivity"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2065
+msgid "Registration expire timeout (seconds)"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2102
+msgid "Network interface"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2138
+msgid "UPnP"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2173
+msgid "Use TURN"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2208
+msgid "(TURN) address"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2243
+msgid "(TURN) username"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2277
+msgid "(TURN) password"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2314
+msgid "(TURN) realm"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2348
+msgid "Use STUN"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2383
+msgid "(STUN) address"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2416
+msgid "Published address"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2453
+msgid "Use custom address and port"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2524
+msgid "Port"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2560
+msgid "Video codecs"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2623
+msgid "Enable video"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2650
+msgid "Audio codecs"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2720
 msgid "SDP Session Negotiation (ICE Fallback)"
 msgstr ""
 
-#: ui/accountaudiotab.ui:75
-msgid "Audio Codecs"
+#: ui/newaccountsettingsview.ui:2732
+msgid "Only used during SDP negotiation in case ICE is not supported."
 msgstr ""
 
-#: ui/usernameregistrationbox.ui:12
-msgid "enter username here"
+#: ui/newaccountsettingsview.ui:2766
+msgid "Audio RTP Min port"
 msgstr ""
 
-#: ui/usernameregistrationbox.ui:24
-msgid "Register"
-msgstr "Registrare"
-
-#: ui/accountbanstab.ui:18
-msgid "List of banned peers :"
+#: ui/newaccountsettingsview.ui:2801
+msgid "Audio RTP Max port"
 msgstr ""
 
-#: ui/accountbanstab.ui:62
-msgid "unban"
+#: ui/newaccountsettingsview.ui:2836
+msgid "Video RTP Min port"
+msgstr ""
+
+#: ui/newaccountsettingsview.ui:2871
+msgid "Video RTP Max port"
+msgstr ""
+
+#: ui/usernameregistrationbox.ui:28
+msgid "register username"
 msgstr ""
 
 #: ui/chatview.ui:19 ui/chatview.ui:22
@@ -558,86 +687,6 @@
 msgid "Send Invitation"
 msgstr ""
 
-#: ui/accountgeneraltab.ui:16
-msgid "Add device"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:88
-msgid "Account"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:148
-msgid "Parameters"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:185
-msgid "Known devices linked to this Ring account"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:226
-msgid "Link another device to this account"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:257 ui/accountgeneraltab.ui:343
-#: src/accountgeneraltab.cpp:326 src/accountgeneraltab.cpp:529
-msgid "Change password"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:273
-msgid "Note: this will change the password only on this device."
-msgstr ""
-
-#: ui/accountgeneraltab.ui:292
-msgid "Current password"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:312
-msgid "New password"
-msgstr "Parolă nouă"
-
-#: ui/accountgeneraltab.ui:332
-msgid "Confirm password"
-msgstr "Confirmă parola"
-
-#: ui/accountgeneraltab.ui:389
-msgid "Export account"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:402
-msgid "Choose destination..."
-msgstr ""
-
-#: ui/accountgeneraltab.ui:455
-msgid "Add New Device"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:470
-msgid ""
-"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."
-msgstr ""
-
-#: ui/accountgeneraltab.ui:479
-msgid "Password (required):"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:490
-msgid "Enter archive password"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:513
-msgid "Export on the Ring"
-msgstr ""
-
-#: ui/accountgeneraltab.ui:534
-msgid "Exporting account on the Ring..."
-msgstr ""
-
-#: ui/accountgeneraltab.ui:558
-msgid "Your generated pin:"
-msgstr ""
-
 #: ui/incomingcallview.ui:99
 msgid "Incoming..."
 msgstr ""
@@ -650,78 +699,6 @@
 msgid "Reject"
 msgstr ""
 
-#: ui/accountsecuritytab.ui:37
-msgid "Encrypt media streams (SRTP)"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:58
-msgid "Key exchange protocol"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:76
-msgid "Fallback on RTP on encryption failure"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:94
-msgid "Media Stream Encryption"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:123
-msgid "Encrypt negotiation (TLS)"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:148
-msgid "CA certificate"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:185
-msgid "User certificate"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:222
-msgid "Private key"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:245
-msgid "Private key password"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:292
-msgid "TLS protocol method"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:315
-msgid "Outgoing TLS server name"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:337
-msgid "Negotiation timeout (seconds)"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:371
-msgid "Use default ciphers"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:387
-msgid "Use custom cipher list"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:444
-msgid "Verify incoming certificates (server side)"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:459
-msgid "Verify answer certificates (client side)"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:474
-msgid "Require a certificate for incoming TLS connections"
-msgstr ""
-
-#: ui/accountsecuritytab.ui:493
-msgid "Negotiation Encryption"
-msgstr ""
-
 #: ui/avatarmanipulation.ui:92 ui/avatarmanipulation.ui:125
 msgid "Take photo"
 msgstr ""
@@ -775,83 +752,48 @@
 msgid "%s says:"
 msgstr ""
 
-#: src/usernameregistrationbox.cpp:137
-msgid "The entered username is not available"
+#: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
+msgid "Register this username on the name server"
 msgstr ""
 
-#: src/usernameregistrationbox.cpp:138
-msgid "Username is not available"
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:147 src/usernameregistrationbox.cpp:251
-msgid "The entered username is not valid"
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:148
-msgid "Username is not valid"
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:157
-msgid "The entered username is available"
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:158
-msgid "Username is available"
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:167
-msgid "Failed to perform lookup"
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:168
-msgid "Could not lookup username"
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:261
-msgid "Looking up username availability..."
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:332
-msgid "Could not initiate name registration, try again."
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:374
-msgid "Register this username on the blockchain"
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:410
-msgid "Invalid username"
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:417 src/accountgeneraltab.cpp:240
-msgid "Bad password"
-msgstr ""
-
-#: src/usernameregistrationbox.cpp:424
+#: src/usernameregistrationbox.cpp:173
 msgid "Username already taken"
 msgstr ""
 
-#: src/usernameregistrationbox.cpp:431
-msgid "Network error"
+#: src/usernameregistrationbox.cpp:180
+msgid "Invalid username"
 msgstr ""
 
-#: src/generalsettingsview.cpp:114
+#: src/usernameregistrationbox.cpp:194
+msgid "Lookup unavailable, check your network connection"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:274
+msgid "Performing lookup..."
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:344
+msgid "Registration in progress..."
+msgstr ""
+
+#: src/generalsettingsview.cpp:106
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:184
+#: src/generalsettingsview.cpp:176
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:187 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:383 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:189 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177
+#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -864,35 +806,26 @@
 msgid "Contacts"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:421
-msgid "_Remove server"
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+msgid "Bad password"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:501
-msgid "Name service URL"
-msgstr ""
-
-#: src/accountadvancedtab.cpp:513
-msgid "Auto-answer calls"
-msgstr ""
-
-#: src/accountadvancedtab.cpp:521
-msgid "UPnP enabled"
-msgstr ""
-
-#: src/accountadvancedtab.cpp:598 src/accountgeneraltab.cpp:686
-msgid "Hostname"
-msgstr "Hostname"
-
-#: src/accountgeneraltab.cpp:246
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
+#: src/accountgeneraltab.cpp:326 src/accountgeneraltab.cpp:529
+#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
+#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+msgid "Change password"
+msgstr ""
+
 #: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
 
@@ -900,13 +833,13 @@
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:620
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:479
+#: src/accountgeneraltab.cpp:479 src/newaccountsettingsview.cpp:621
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -926,18 +859,14 @@
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:561
+#: src/accountgeneraltab.cpp:561 src/newaccountsettingsview.cpp:679
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:582
+#: src/accountgeneraltab.cpp:582 src/newaccountsettingsview.cpp:701
 msgid "Error when revoking device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:620
-msgid "Alias"
-msgstr "Alias"
-
 #: src/accountgeneraltab.cpp:631
 msgid "Type"
 msgstr ""
@@ -946,31 +875,23 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:670 src/accountgeneraltab.cpp:696
-msgid "Username"
-msgstr "Nume de utilizator"
+#: src/accountgeneraltab.cpp:687
+msgid "Hostname"
+msgstr "Hostname"
 
-#: src/accountgeneraltab.cpp:706
-msgid "Password"
-msgstr "Parola"
-
-#: src/accountgeneraltab.cpp:719
+#: src/accountgeneraltab.cpp:720
 msgid "Show password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:725
-msgid "Proxy"
-msgstr ""
-
-#: src/accountgeneraltab.cpp:735
+#: src/accountgeneraltab.cpp:736
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:799
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -990,11 +911,11 @@
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:380
+#: src/avatarmanipulation.cpp:403
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:385 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
 msgid "_Open"
 msgstr ""
 
@@ -1016,36 +937,27 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:503
+#: src/ringmainwindow.cpp:166
+msgid "Add account..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:624
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:506
+#: src/ringmainwindow.cpp:627
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:783
+#: src/ringmainwindow.cpp:916
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/accountvideotab.cpp:184 src/accountaudiotab.cpp:175
-msgid "Enabled"
-msgstr ""
-
-#: src/accountvideotab.cpp:190
-msgctxt "The name of the codec"
-msgid "Name"
-msgstr "Nume"
-
-#: src/accountvideotab.cpp:194 src/accountaudiotab.cpp:185
-msgid "Bitrate"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1061,15 +973,6 @@
 "Ring will now quit."
 msgstr ""
 
-#: src/accountaudiotab.cpp:181
-msgctxt "Name of the codec"
-msgid "Name"
-msgstr "Nume"
-
-#: src/accountaudiotab.cpp:189
-msgid "Samplerate"
-msgstr ""
-
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
 msgstr ""
@@ -1124,18 +1027,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:218
-msgid ""
-"Your account was created, but we could not register your username. Try again"
-" from the settings menu."
-msgstr ""
-
-#: src/accountcreationwizard.cpp:262
-msgctxt "The default username / account alias, if none is set by the user"
-msgid "Unknown"
-msgstr "Necunoscut"
-
-#: src/accountcreationwizard.cpp:462
+#: src/accountcreationwizard.cpp:355
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1167,51 +1059,81 @@
 msgid "Send File"
 msgstr ""
 
-#: src/currentcallview.cpp:956
+#: src/accountmigrationview.cpp:175 src/newaccountsettingsview.cpp:962
+msgid ""
+"Warning! This action will remove this account on this device!\n"
+"Note: this action cannot be undone. Also, your registered name can be lost!"
+msgstr ""
+
+#: src/currentcallview.cpp:952
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/accountview.cpp:187
-msgctxt "Account settings"
-msgid "General"
-msgstr "General"
-
-#: src/accountview.cpp:193
-msgctxt "Account settings"
-msgid "Security"
-msgstr "Seuritate"
-
-#: src/accountview.cpp:198
-msgctxt "Account settings"
-msgid "Advanced"
-msgstr "Avansat"
-
-#: src/accountview.cpp:205
-msgctxt "List of banned peers"
-msgid "Bans"
+#: src/newaccountsettingsview.cpp:679
+msgid "Edit name"
 msgstr ""
 
-#: src/accountview.cpp:260
-#, c-format
-msgid "Are you sure you want to delete account \"%s\"?"
+#: src/newaccountsettingsview.cpp:774
+msgid "Unban"
 msgstr ""
 
-#: src/accountview.cpp:394
-msgid "New Account"
+#: src/newaccountsettingsview.cpp:810
+msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/accountview.cpp:481
-msgctxt "Account state column"
-msgid "Enabled"
+#: src/newaccountsettingsview.cpp:821
+msgid "Incorrect password!"
 msgstr ""
 
-#: src/accountview.cpp:487
-msgctxt "Account alias (name) column"
-msgid "Alias"
-msgstr "Alias"
+#: src/newaccountsettingsview.cpp:858
+msgid "Note: this will change the password only on this device."
+msgstr ""
 
-#: src/accountview.cpp:495
-msgctxt "Account status column"
-msgid "Status"
+#: src/newaccountsettingsview.cpp:861
+msgid "Current password"
+msgstr ""
+
+#: src/newaccountsettingsview.cpp:867
+msgid "New password"
+msgstr "Parolă nouă"
+
+#: src/newaccountsettingsview.cpp:947
+msgid "Account exported!"
+msgstr ""
+
+#: src/newaccountsettingsview.cpp:947
+msgid "Export account failure."
+msgstr ""
+
+#: src/newaccountsettingsview.cpp:1713
+msgid "Unknown error"
+msgstr ""
+
+#: src/newaccountsettingsview.cpp:1959
+msgid "Initializing..."
+msgstr ""
+
+#: src/newaccountsettingsview.cpp:1962
+msgid "Offline"
+msgstr ""
+
+#: src/newaccountsettingsview.cpp:1965
+msgid "Connecting..."
+msgstr ""
+
+#: src/newaccountsettingsview.cpp:1968
+msgid "Online"
+msgstr ""
+
+#: src/newaccountsettingsview.cpp:1972
+msgid "Unknown status"
+msgstr ""
+
+#: src/newaccountsettingsview.cpp:2001
+msgid "••••••••"
+msgstr ""
+
+#: src/newaccountsettingsview.cpp:2001
+msgid "no password set"
 msgstr ""