diff --git a/ui/nl.lproj/AccAdvanced.strings b/ui/nl.lproj/AccAdvanced.strings
index f408395..f0e4c03 100644
--- a/ui/nl.lproj/AccAdvanced.strings
+++ b/ui/nl.lproj/AccAdvanced.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "0eY-9x-bAr"; */
-"0eY-9x-bAr.placeholderString" = "Server url...";
+"0eY-9x-bAr.placeholderString" = "Server-URL...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "realm..."; ObjectID = "6u9-cM-ep0"; */
 "6u9-cM-ep0.placeholderString" = "realm...";
@@ -12,13 +12,13 @@
 "FQ4-fp-Pxj.title" = "Min";
 
 /* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Jho-hi-Mvg"; */
-"Jho-hi-Mvg.title" = "Audio RTP Poortenreeks";
+"Jho-hi-Mvg.title" = "Audio RTP-poortenreeks";
 
 /* Class = "NSTextFieldCell"; title = "Network Interface"; ObjectID = "K9I-vh-jeu"; */
 "K9I-vh-jeu.title" = "Netwerkinterface";
 
 /* Class = "NSButtonCell"; title = "Set published address and port"; ObjectID = "OL5-DI-aCq"; */
-"OL5-DI-aCq.title" = "Gepubliceerde adres en poort instellen";
+"OL5-DI-aCq.title" = "Stel gepubliceerd adres en poort in";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "password..."; ObjectID = "OR2-la-DUE"; */
 "OR2-la-DUE.placeholderString" = "wachtwoord...";
@@ -30,10 +30,10 @@
 "QS0-TJ-NQh.title" = "TURN gebruiken";
 
 /* Class = "NSTextFieldCell"; title = "Published Address"; ObjectID = "Qf3-E3-5U6"; */
-"Qf3-E3-5U6.title" = "Gepubliceerde Adres";
+"Qf3-E3-5U6.title" = "Gepubliceerd adres";
 
 /* Class = "NSTextFieldCell"; title = "Video RTP port Range"; ObjectID = "XA8-Sy-CYG"; */
-"XA8-Sy-CYG.title" = "Video RTP Poortenreeks";
+"XA8-Sy-CYG.title" = "Video RTP-poortenreeks";
 
 /* Class = "NSTextFieldCell"; title = "Min"; ObjectID = "a6W-wm-OmC"; */
 "a6W-wm-OmC.title" = "Min";
@@ -60,7 +60,7 @@
 "shs-Xm-qnY.title" = "Lokale poort";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "uzg-09-8vi"; */
-"uzg-09-8vi.placeholderString" = "Server url...";
+"uzg-09-8vi.placeholderString" = "Server-URL...";
 
 /* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "wl8-YK-M76"; */
 "wl8-YK-M76.title" = "Poort";
diff --git a/ui/nl.lproj/AccGeneral.strings b/ui/nl.lproj/AccGeneral.strings
index b87cb5b..4305291 100644
--- a/ui/nl.lproj/AccGeneral.strings
+++ b/ui/nl.lproj/AccGeneral.strings
@@ -1,21 +1,27 @@
 
+/* Class = "NSButtonCell"; title = "RTP"; ObjectID = "0D8-im-2uM"; */
+"0D8-im-2uM.title" = "RTP";
+
 /* Class = "NSButtonCell"; title = "Try Registration"; ObjectID = "21g-eQ-0Sc"; */
-"21g-eQ-0Sc.title" = "Registratie Proberen";
+"21g-eQ-0Sc.title" = "Registratie proberen";
 
 /* Class = "NSTextFieldCell"; title = "Server hostname"; ObjectID = "3uy-g0-eCm"; */
-"3uy-g0-eCm.title" = "Server hostnaam";
+"3uy-g0-eCm.title" = "Serverhostnaam";
 
 /* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "4Nm-hw-379"; */
 "4Nm-hw-379.title" = "Gebruikersnaam";
 
 /* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "KSm-ZB-4aj"; */
-"KSm-ZB-4aj.title" = "Aangepaste user-agent gebruiken";
+"KSm-ZB-4aj.title" = "Aangepaste gebruikersagent gebruiken";
 
 /* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Mxv-Rt-ON6"; */
 "Mxv-Rt-ON6.title" = "Alias";
 
 /* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "N5h-tI-ZLz"; */
-"N5h-tI-ZLz.title" = "Upnp ingeschakeld";
+"N5h-tI-ZLz.title" = "UPnP ingeschakeld";
+
+/* Class = "NSTextFieldCell"; title = "DTMF tone type"; ObjectID = "Rg8-qR-h1X"; */
+"Rg8-qR-h1X.title" = "Type kiestoon (DTMF)";
 
 /* Class = "NSButtonCell"; title = "Show password"; ObjectID = "UXm-73-BNy"; */
 "UXm-73-BNy.title" = "Wachtwoord tonen";
@@ -26,6 +32,9 @@
 /* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "YMy-QE-7A3"; */
 "YMy-QE-7A3.title" = "Oproepen automatisch beantwoorden";
 
+/* Class = "NSButtonCell"; title = "SIP"; ObjectID = "jch-Qt-hTO"; */
+"jch-Qt-hTO.title" = "SIP";
+
 /* Class = "NSTextFieldCell"; title = "Parameters"; ObjectID = "mlN-YG-fLS"; */
 "mlN-YG-fLS.title" = "Parameters";
 
diff --git a/ui/nl.lproj/AccRing.strings b/ui/nl.lproj/AccRing.strings
index 153ed95..7714093 100644
--- a/ui/nl.lproj/AccRing.strings
+++ b/ui/nl.lproj/AccRing.strings
@@ -1,19 +1,19 @@
 
-/* Class = "NSTextFieldCell"; title = "This will be displayed to unknown peers"; ObjectID = "0Yt-xC-OWa"; */
-"0Yt-xC-OWa.title" = "Dit wordt getoond aan onbekende gebruikers";
-
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "1Sx-Et-CDM"; */
 "1Sx-Et-CDM.title" = "Account";
 
+/* Class = "NSTextFieldCell"; title = "RingID"; ObjectID = "8WI-fC-Due"; */
+"8WI-fC-Due.title" = "Ring-ID";
+
 /* Class = "NSTextFieldCell"; title = "Bootstrap server"; ObjectID = "B6b-iB-REZ"; */
 "B6b-iB-REZ.title" = "Bootstrapserver";
 
-/* Class = "NSTextFieldCell"; title = "TYPE"; ObjectID = "Bqr-Gq-OgA"; */
-"Bqr-Gq-OgA.title" = "TYPE";
-
 /* Class = "NSTextFieldCell"; title = "Permissions"; ObjectID = "EDd-FX-wcz"; */
 "EDd-FX-wcz.title" = "Machtigingen";
 
+/* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
+"G8M-go-xvD.title" = "Naam registreren";
+
 /* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
 "HN3-i9-zmw.placeholderString" = "Naam of bijnaam";
 
@@ -26,23 +26,20 @@
 /* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Wzq-V2-YLU"; */
 "Wzq-V2-YLU.title" = "Alias";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "bca-Wv-Xul"; */
-"bca-Wv-Xul.title" = "Dit is uw RingID. Deel hem met uw vrienden!";
-
-/* Class = "NSTextFieldCell"; title = "Ring Identifier"; ObjectID = "dPO-b1-o58"; */
-"dPO-b1-o58.title" = "Ring Aanduiding";
-
 /* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "ddk-1G-0jU"; */
-"ddk-1G-0jU.title" = "Aangepaste user-agent gebruiken";
+"ddk-1G-0jU.title" = "Aangepaste gebruikersagent gebruiken";
+
+/* Class = "NSTextFieldCell"; title = "Blockchain server"; ObjectID = "fSU-Pc-Y5a"; */
+"fSU-Pc-Y5a.title" = "Blokketenserver";
 
 /* Class = "NSButtonCell"; title = "Allow calls from peers in your contact list"; ObjectID = "fX7-9W-XFl"; */
-"fX7-9W-XFl.title" = "Oproepen accepteren van gebruikers in de contactenlijst";
+"fX7-9W-XFl.title" = "Oproepen van gebruikers in de contactenlijst toestaan";
 
 /* Class = "NSButtonCell"; title = "Allow calls from unknown peers"; ObjectID = "kmI-jb-aal"; */
-"kmI-jb-aal.title" = "Oproepen accepteren van onbekende gebruikers";
+"kmI-jb-aal.title" = "Oproepen van onbekende gebruikers toestaan";
 
 /* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "lHI-bz-ddQ"; */
-"lHI-bz-ddQ.title" = "Upnp ingeschakeld";
+"lHI-bz-ddQ.title" = "UPnP ingeschakeld";
 
-/* Class = "NSTextFieldCell"; title = "Type"; ObjectID = "ubB-AZ-nAm"; */
-"ubB-AZ-nAm.title" = "Type";
+/* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
+"sBB-y7-xhL.title" = "Geregistreerde naam";
diff --git a/ui/nl.lproj/AccSecurity.strings b/ui/nl.lproj/AccSecurity.strings
index 7596cfb..e7ccb87 100644
--- a/ui/nl.lproj/AccSecurity.strings
+++ b/ui/nl.lproj/AccSecurity.strings
@@ -1,15 +1,15 @@
 
 /* Class = "NSButtonCell"; title = "Require certificates for incoming TLS connections"; ObjectID = "1f9-X5-ykb"; */
-"1f9-X5-ykb.title" = "Certificaten voor binnenkomende TLS verbindingen vereisen";
+"1f9-X5-ykb.title" = "Certificaten voor inkomende TLS-verbindingen vereisen";
 
 /* Class = "NSButtonCell"; title = "Verify certificates, as a client"; ObjectID = "1xi-9G-zOX"; */
-"1xi-9G-zOX.title" = "Certificaten verifiëren, als een client";
+"1xi-9G-zOX.title" = "Certificaten verifiëren als een cliënt";
 
 /* Class = "NSButtonCell"; title = "Use custom cipher list"; ObjectID = "2e5-zS-ghg"; */
 "2e5-zS-ghg.title" = "Aangepaste codering gebruiken";
 
 /* Class = "NSTextFieldCell"; placeholderString = "cipher cell"; ObjectID = "5LC-T6-hpk"; */
-"5LC-T6-hpk.placeholderString" = "Sleutelcel";
+"5LC-T6-hpk.placeholderString" = "sleutelcel";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "7c2-kF-dcs"; */
 "7c2-kF-dcs.placeholderString" = "Wachtwoord...";
@@ -27,19 +27,19 @@
 "Jqz-P0-zAz.title" = "Gebruikerscertificaat";
 
 /* Class = "NSTextFieldCell"; title = "Server name instance for outgoing TLS connection"; ObjectID = "UxS-et-whJ"; */
-"UxS-et-whJ.title" = "Servernaam instantie voor uitgaande TLS verbinding";
+"UxS-et-whJ.title" = "Servernaam instantie voor uitgaande TLS -verbinding";
 
 /* Class = "NSButtonCell"; title = "Use SRTP"; ObjectID = "YtQ-hx-hih"; */
 "YtQ-hx-hih.title" = "SRTP gebruiken";
 
 /* Class = "NSButtonCell"; title = "Use TLS transport"; ObjectID = "oTT-gO-fqM"; */
-"oTT-gO-fqM.title" = "TLS transport gebruiken";
+"oTT-gO-fqM.title" = "TLS-transport gebruiken";
 
 /* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "uOE-XA-5gW"; */
-"uOE-XA-5gW.title" = "TLS protocol methode";
+"uOE-XA-5gW.title" = "TLS-protocolmethode";
 
 /* Class = "NSTextFieldCell"; title = "Certificate Authority list"; ObjectID = "vPF-Rp-aR6"; */
 "vPF-Rp-aR6.title" = "Lijst van certificeringsinstanties";
 
 /* Class = "NSButtonCell"; title = "Verify incoming certificates, as a server"; ObjectID = "x2s-ov-cVQ"; */
-"x2s-ov-cVQ.title" = "Binnenkomende certificaten verifiëren, als een server";
+"x2s-ov-cVQ.title" = "Inkomende certificaten verifiëren als een server";
diff --git a/ui/nl.lproj/Accounts.strings b/ui/nl.lproj/Accounts.strings
index 612dd09..7970934 100644
--- a/ui/nl.lproj/Accounts.strings
+++ b/ui/nl.lproj/Accounts.strings
@@ -5,12 +5,6 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Type"; ObjectID = "KoR-IH-uuI"; */
 "KoR-IH-uuI.placeholderString" = "Type";
 
-/* Class = "NSTextFieldCell"; title = "Create Account"; ObjectID = "OZ9-qH-dYW"; */
-"OZ9-qH-dYW.title" = "Account aanmaken";
-
-/* Class = "NSButtonCell"; title = "Export"; ObjectID = "OeK-Sf-pdc"; */
-"OeK-Sf-pdc.title" = "Exporteren";
-
 /* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "RT7-u6-bhe"; */
 "RT7-u6-bhe.label" = "Geavanceerd";
 
@@ -20,6 +14,9 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "ZDh-Jh-hfW"; */
 "ZDh-Jh-hfW.placeholderString" = "Naam";
 
+/* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
+"cT1-A5-rbj.label" = "Apparaten";
+
 /* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
 "eEz-Lm-SOj.placeholderString" = "Status";
 
@@ -28,6 +25,3 @@
 
 /* Class = "NSTabViewItem"; label = "General"; ObjectID = "tPR-Ac-N5Y"; */
 "tPR-Ac-N5Y.label" = "Algemeen";
-
-/* Class = "NSButtonCell"; title = "Import"; ObjectID = "zov-Bb-Fgp"; */
-"zov-Bb-Fgp.title" = "Importeren";
diff --git a/ui/nl.lproj/AudioPrefs.strings b/ui/nl.lproj/AudioPrefs.strings
index 0f485b9..c98ff17 100644
--- a/ui/nl.lproj/AudioPrefs.strings
+++ b/ui/nl.lproj/AudioPrefs.strings
@@ -15,7 +15,7 @@
 "ksV-r2-EVJ.title" = "Opslaan in";
 
 /* Class = "NSButtonCell"; title = "Mute DTMF"; ObjectID = "pAA-Iv-EmI"; */
-"pAA-Iv-EmI.title" = "DTMF kiestoon dempen";
+"pAA-Iv-EmI.title" = "DTMF-kiestoon dempen";
 
 /* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
 "x1o-rT-jy6.title" = "Invoer";
diff --git a/ui/nl.lproj/BackupAccountWindow.strings b/ui/nl.lproj/BackupAccountWindow.strings
new file mode 100644
index 0000000..e964f51
--- /dev/null
+++ b/ui/nl.lproj/BackupAccountWindow.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
+"5Qf-em-tN4.placeholderString" = "Bevestigen...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Wachtwoord...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Wachtwoord...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Wachtwoord...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Wachtwoord...";
+
+/* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
+"9h8-GU-av4.title" = "Waar";
+
+/* Class = "NSTextFieldCell"; title = "Choose where to backup your account. It needs to be password protected."; ObjectID = "KYZ-TW-44Y"; */
+"KYZ-TW-44Y.title" = "Kies waar je een reservekopie van je account wil maken. Deze moet beschermd worden met een wachtwoord.";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Venster";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "Oké";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
+"cSU-aD-OwX.title" = "Annuleren";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "Wachtwoord...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedMultipleValuesPlaceholder" = "Wachtwoord...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedNoSelectionPlaceholder" = "Wachtwoord...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
+"ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Wachtwoord...";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.title" = "Er is een fout opgetreden tijdens het maken van de reservekopie";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "Oké";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Wachtwoord";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Wachtwoord...";
diff --git a/ui/nl.lproj/Conversation.strings b/ui/nl.lproj/Conversation.strings
index 1a32145..765a69c 100644
--- a/ui/nl.lproj/Conversation.strings
+++ b/ui/nl.lproj/Conversation.strings
@@ -8,17 +8,17 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
 "Ilz-7v-2fr.placeholderString" = "Een bericht versturen";
 
-/* Class = "BindingConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
 "ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Een bericht versturen";
 
-/* Class = "BindingConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
 "ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Een bericht versturen";
 
-/* Class = "BindingConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
 "ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Een bericht versturen";
 
 /* Class = "NSTextFieldCell"; title = "Start the conversation!"; ObjectID = "bsl-nv-Wqq"; */
-"bsl-nv-Wqq.title" = "De conversatie beginnen!";
+"bsl-nv-Wqq.title" = "Begin het gesprek!";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "ooq-vs-Xt1"; */
 "ooq-vs-Xt1.ibShadowedToolTip" = "Opnemen";
diff --git a/ui/nl.lproj/CurrentCall.strings b/ui/nl.lproj/CurrentCall.strings
index c673815..9077a83 100644
--- a/ui/nl.lproj/CurrentCall.strings
+++ b/ui/nl.lproj/CurrentCall.strings
@@ -15,7 +15,10 @@
 "Dqv-um-UUk.title" = "URI";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Incoming Display Name"; ObjectID = "EA3-Q5-Dyj"; */
-"EA3-Q5-Dyj.placeholderString" = "Binnenkomende Oproepnaam";
+"EA3-Q5-Dyj.placeholderString" = "Inkomende oproepnaam";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "G0w-c3-9pJ"; */
+"G0w-c3-9pJ.ibShadowedToolTip" = "Opnemen";
 
 /* Class = "NSButtonCell"; title = "Answer"; ObjectID = "KPG-pB-gPm"; */
 "KPG-pB-gPm.title" = "Beantwoorden";
@@ -29,6 +32,9 @@
 /* Class = "NSTextFieldCell"; title = "Cancel"; ObjectID = "TlL-HO-5Ey"; */
 "TlL-HO-5Ey.title" = "Annuleren";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "VVL-A4-r7n"; */
+"VVL-A4-r7n.ibShadowedToolTip" = "Opnemen";
+
 /* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
 "X0W-vv-xua.title" = "wil met u spreken!";
 
@@ -36,10 +42,10 @@
 "anb-Y8-JQi.ibShadowedToolTip" = "In wacht zetten";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
-"fmp-x4-Pef.ibShadowedToolTip" = "Chat in/uitschakelen";
+"fmp-x4-Pef.ibShadowedToolTip" = "Chat in-/uitschakelen";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Add participant"; ObjectID = "kIZ-mf-moM"; */
-"kIZ-mf-moM.ibShadowedToolTip" = "Deelnemen toevoegen";
+"kIZ-mf-moM.ibShadowedToolTip" = "Deelnemer toevoegen";
 
 /* Class = "NSButtonCell"; title = "Button"; ObjectID = "kxH-yM-TLd"; */
 "kxH-yM-TLd.title" = "Knop";
@@ -69,7 +75,7 @@
 "wRO-X4-7IU.title" = "Beantwoorden";
 
 /* Class = "NSTextFieldCell"; title = "wants to talk with you!"; ObjectID = "yZ6-1A-ZLT"; */
-"yZ6-1A-ZLT.title" = "wil met uw praten!";
+"yZ6-1A-ZLT.title" = "wil met u spreken!";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Time"; ObjectID = "zsO-T7-9yi"; */
 "zsO-T7-9yi.placeholderString" = "Tijd";
diff --git a/ui/nl.lproj/ExportPasswordWindow.strings b/ui/nl.lproj/ExportPasswordWindow.strings
new file mode 100644
index 0000000..e36568d
--- /dev/null
+++ b/ui/nl.lproj/ExportPasswordWindow.strings
@@ -0,0 +1,42 @@
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Wachtwoord...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Wachtwoord...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Wachtwoord...";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Wachtwoord...";
+
+/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "Voer je Ring-accountwachtwoord in om te beginnen";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Venster";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "Oké";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cSU-aD-OwX"; */
+"cSU-aD-OwX.title" = "Annuleren";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "dfD-AK-f3R"; */
+"dfD-AK-f3R.title" = "Oké";
+
+/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.placeholderString" = "foutlabel";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "Oké";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Wachtwoord";
+
+/* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
+"wmv-sA-Mlh.title" = "Een ander apparaat aan deze account koppelen";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Wachtwoord...";
diff --git a/ui/nl.lproj/GeneralPrefs.strings b/ui/nl.lproj/GeneralPrefs.strings
index 12d09d7..afeb127 100644
--- a/ui/nl.lproj/GeneralPrefs.strings
+++ b/ui/nl.lproj/GeneralPrefs.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Keep my history for"; ObjectID = "3Pb-Ec-zl5"; */
-"3Pb-Ec-zl5.title" = "geschiedenis bewaren voor";
+"3Pb-Ec-zl5.title" = "Geschiedenis bewaren voor";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
 "42E-UY-qlP.title" = "Maandelijks";
@@ -8,24 +8,27 @@
 /* Class = "NSMenuItem"; title = "Weekly"; ObjectID = "AId-am-73Q"; */
 "AId-am-73Q.title" = "Wekelijks";
 
-/* Class = "NSTextFieldCell"; title = "History"; ObjectID = "DSD-yl-noX"; */
-"DSD-yl-noX.title" = "Geschiedenis";
-
 /* Class = "NSTextFieldCell"; title = "30"; ObjectID = "JvS-c4-OeT"; */
 "JvS-c4-OeT.title" = "30";
 
+/* Class = "NSTextField"; ibShadowedToolTip = "Profile"; ObjectID = "MV1-AC-qE7"; */
+"MV1-AC-qE7.ibShadowedToolTip" = "Profiel";
+
 /* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
-"O2C-xR-mHF.title" = "Automatisch Starten";
+"O2C-xR-mHF.title" = "Automatisch starten";
 
 /* Class = "NSTextFieldCell"; title = "(Applied on application restart)"; ObjectID = "OTl-vx-S43"; */
-"OTl-vx-S43.title" = "(actief nadat applicatie herstart is)";
+"OTl-vx-S43.title" = "(Actief nadat applicatie herstart is)";
 
-/* Class = "NSTextFieldCell"; title = "Interruptions"; ObjectID = "Rzy-Gh-3wQ"; */
-"Rzy-Gh-3wQ.title" = "Onderbrekingen";
+/* Class = "NSTextFieldCell"; title = "Behaviours"; ObjectID = "Rzy-Gh-3wQ"; */
+"Rzy-Gh-3wQ.title" = "Gedrag";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
 "T3a-yx-ZaW.title" = "Automatisch op updates controleren";
 
+/* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "Thg-oC-5Qw"; */
+"Thg-oC-5Qw.title" = "Profiel";
+
 /* Class = "NSMenuItem"; title = "Daily"; ObjectID = "cB6-4m-9MU"; */
 "cB6-4m-9MU.title" = "Dagelijks";
 
@@ -41,14 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSTextFieldCell"; title = "Window behaviour"; ObjectID = "sog-Ok-Y0N"; */
-"sog-Ok-Y0N.title" = "Gedrag venster";
-
-/* Class = "NSButtonCell"; title = "Enable Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Notificaties inschakelen";
+/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
+"uCL-ye-tsv.title" = "Bureaubladmeldingen inschakelen";
 
 /* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
-"uYI-hA-JHk.title" = "Ring naar voorgrond brengen bij binnenkomende oproepen";
+"uYI-hA-JHk.title" = "Ring naar voorgrond brengen bij inkomende oproepen";
 
-/* Class = "NSTextFieldCell"; title = "Desktop Notifications"; ObjectID = "xlz-zw-IJI"; */
-"xlz-zw-IJI.title" = "Bureaublad notificaties";
+/* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
+"vbU-2S-O58.title" = "Dit wordt gedeeld met je contacten";
diff --git a/ui/nl.lproj/Localizable.strings b/ui/nl.lproj/Localizable.strings
index 8fe59a4..2e285ec 100644
--- a/ui/nl.lproj/Localizable.strings
+++ b/ui/nl.lproj/Localizable.strings
@@ -1,20 +1,23 @@
 
+"A network error occured during the export" = "Er is een netwerkfout opgetreden tijdens het exporteren";
+
+/* Contextual menu action */
 "Add to contacts" = "Aan contacten toevoegen";
 
-/* Error shown to the user */
-"An error occured during the export" = "An error occured during the export";
+/* Text shown to the user */
+"Alias : " = "Alias:";
 
 /* Error shown to the user */
-"An error occured during the import" = "An error occured during the import";
+"An error occured during the export" = "Er is een fout opgetreden tijdens het exporteren";
+
+/* Contextual menu entry */
+"Backup account" = "Reservekopie van account maken";
 
 /* Contextual menu action */
 "Call number" = "Nummer bellen";
 
-/* Open panel prompt for 'Choose a file' */
-"Choose" = "Kiezen";
-
 /* Open panel title */
-"Choose a CA list" = "Kies een CA lijst";
+"Choose a CA list" = "Kies een CA-lijst";
 
 /* Open panel title */
 "Choose a certificate" = "Kies een certificaat";
@@ -34,24 +37,57 @@
 /* Contextual menu entry */
 "Choose file" = "Kies bestand";
 
-/* Continue button */
-"Continue" = "Verder";
-
 /* No comment provided by engineer. */
 "Copy" = "Kopiëren";
 
 /* Contextual menu action */
+"Copy name" = "Naam kopiëren";
+
+/* Contextual menu action */
 "Copy number" = "Nummer kopiëren";
 
-/* Incoming call from {Name} */
-"Incoming call from %@" = "Binnenkomende oproep van %@";
+/* Contextual menu entry */
+"Create RING Account" = "Ring-account aanmaken";
 
-/* Indication for user */
-"Just a moment..." = "Even geduld aub...";
+/* Contextual menu entry */
+"Create SIP Account" = "SIP-account aanmaken";
+
+/* Alert dialog title */
+"Entered name not found" = "Ingevoerde naam niet gevonden";
+
+/* Error message shown to user when it is impossible to migrate account */
+"Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Migreren van account mislukt. Je kan opnieuw proberen door op Oké te klikken of je account verwijderen.";
+
+/* Text shown to user when an error occur at registration */
+"Failed to perform lookup" = "Opzoeken mislukt";
+
+/* Text shown to the user */
+"ID : " = "ID:";
+
+/* Incoming call from {Name} */
+"Incoming call from %@" = "Inkomende oproep van %@";
+
+/* Alert dialo message */
+"Make sure you have at least one valid account" = "Zorg dat je minstens een geldige account hebt";
 
 /* Message from {Name} */
 "Message from %@" = "Bericht van %@";
 
+/* User label */
+"New SIP account" = "Nieuwe SIP-account";
+
+/* Alert dialog title */
+"No valid account available" = "Geen geldige account beschikbaar";
+
+/* Text show to the user when password didn't match */
+"Password and confirmation mismatch." = "Wachtwoord en bevestiging komen niet overeen.";
+
+/* Indication for user */
+"Password is too short" = "Wachtwoord is te kort";
+
+/* Indication for user */
+"Passwords don't match" = "Wachtwoorden komen niet overeen";
+
 /* Button label */
 "Pause" = "Pauze";
 
@@ -67,15 +103,45 @@
 /* Show advice to user */
 "Reopen account to see your hash" = "Account heropenen om uw hash te bekijken";
 
-/* Display message to user */
-"Ring is already ready to work" = "Ring is reeds klaar voor gebruik";
+/* Contextual menu entry */
+"Restore account" = "Account herstellen";
+
+/* Button title */
+"Revise Input" = "Invoer herzien";
 
 /* No comment provided by engineer. */
 "Share" = "Delen";
 
 /* No comment provided by engineer. */
-"Text Actions" = "Tekst Handelingen";
+"Text Actions" = "Teksthandelingen";
+
+/* Text shown to user when his username is available to be registered */
+"The entered username is available" = "De ingevoerde gebruikersnaam is beschikbaar";
+
+/* Text shown to user when his username is invalid to be registered */
+"The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters." = "De ingevoerde gebruikersnaam is ongeldig. De gebruikersnaam moet minstens 3 tekens lang zijn, en mag enkel kleine alfanumerieke tekens bevatten.";
+
+/* Text shown to user when his username is already registered */
+"The entered username is not available" = "De ingevoerde gebruikersnaam is niet beschikbaar";
+
+/* Text shown to the user */
+"The following account needs to be migrated to the new Ring account format:" = "De volgende account moet gemigreerd worden naar het nieuwe Ring-accountformaat:";
+
+/* Error shown to the user */
+"The password you entered does not unlock this account" = "Het wachtwoord dat je hebt ingevoerd ontgrendelt deze account niet";
+
+/* Alert dialog title */
+"The username you entered do not match a RingID on the network" = "De gebruikersnaam die je hebt ingevoerd komt niet overeen met een Ring-ID op het netwerk";
+
+/* Title shown to user to concat with Pin */
+"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "Om het proces te voltooien open je Ring op het nieuwe apparaat en kies je de optie \"Dit apparaat aan een account koppelen\". Je PIN-code is 10 minuten geldig.";
+
+/* Text shown to the user */
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "Om door te gaan met de migratie moet je een wachtwoord voor je account kiezen. Dit wachtwoord zal gebruikt worden om je hoofdsleutel te versleutelen. Het wachtwoord wordt vereist om nieuwe apparaten aan je Ring-account toe te voegen. Als je nog niet klaar bent om een wachtwoord te kiezen kan je Ring sluiten en de migratie later verderzetten.";
 
 /* Name used when user leave field empty */
 "Unknown" = "Onbekend";
 
+/* Error shown to user */
+"You have to migrate your account before exporting" = "Je moet je account migreren vooraleer je deze kan exporteren";
+
diff --git a/ui/nl.lproj/MainMenu.strings b/ui/nl.lproj/MainMenu.strings
index ebfb0b3..ebdf90b 100644
--- a/ui/nl.lproj/MainMenu.strings
+++ b/ui/nl.lproj/MainMenu.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
-"5.title" = "Alles Naar Voorgrond Brengen";
+"5.title" = "Alles naar voorgrond brengen";
 
 /* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
 "19.title" = "Venster";
@@ -33,37 +33,37 @@
 "131.title" = "Diensten";
 
 /* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Ring Verbergen";
+"134.title" = "Ring verbergen";
 
 /* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Ring Afsluiten";
+"136.title" = "Ring afsluiten";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
-"145.title" = "Anderen Verbergen";
+"145.title" = "Anderen verbergen";
 
 /* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
-"150.title" = "Alles Tonen";
+"150.title" = "Alles tonen";
 
 /* Class = "NSMenuItem"; title = "Stop Speaking"; ObjectID = "195"; */
-"195.title" = "Stop Met Spreken";
+"195.title" = "Stop met spreken";
 
 /* Class = "NSMenuItem"; title = "Start Speaking"; ObjectID = "196"; */
-"196.title" = "Start Met Spreken";
+"196.title" = "Begin met spreken";
 
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "197"; */
 "197.title" = "Kopiëren";
 
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "198"; */
-"198.title" = "Alles Selecteren";
+"198.title" = "Alles selecteren";
 
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "199"; */
 "199.title" = "Knippen";
 
 /* Class = "NSMenu"; title = "Spelling and Grammar"; ObjectID = "200"; */
-"200.title" = "Spelling en Grammatica";
+"200.title" = "Spelling en grammatica";
 
 /* Class = "NSMenuItem"; title = "Check Document Now"; ObjectID = "201"; */
-"201.title" = "Document Nu Controleren";
+"201.title" = "Document nu controleren";
 
 /* Class = "NSMenuItem"; title = "Delete"; ObjectID = "202"; */
 "202.title" = "Verwijderen";
@@ -72,7 +72,7 @@
 "203.title" = "Plakken";
 
 /* Class = "NSMenuItem"; title = "Show Spelling and Grammar"; ObjectID = "204"; */
-"204.title" = "Spelling en Grammatica Tonen";
+"204.title" = "Spelling en grammatica tonen";
 
 /* Class = "NSMenu"; title = "Edit"; ObjectID = "205"; */
 "205.title" = "Wijzigen";
@@ -81,13 +81,13 @@
 "207.title" = "Ongedaan maken";
 
 /* Class = "NSMenuItem"; title = "Find Next"; ObjectID = "208"; */
-"208.title" = "Volgende Zoeken";
+"208.title" = "Volgende zoeken";
 
 /* Class = "NSMenuItem"; title = "Find…"; ObjectID = "209"; */
 "209.title" = "Zoeken...";
 
 /* Class = "NSMenuItem"; title = "Jump to Selection"; ObjectID = "210"; */
-"210.title" = "Naar Selectie";
+"210.title" = "Naar selectie";
 
 /* Class = "NSMenuItem"; title = "Speech"; ObjectID = "211"; */
 "211.title" = "Spraak";
@@ -96,13 +96,13 @@
 "212.title" = "Spraak";
 
 /* Class = "NSMenuItem"; title = "Find Previous"; ObjectID = "213"; */
-"213.title" = "Vorige Zoeken";
+"213.title" = "Vorige zoeken";
 
 /* Class = "NSMenuItem"; title = "Redo"; ObjectID = "215"; */
 "215.title" = "Herhalen";
 
 /* Class = "NSMenuItem"; title = "Spelling and Grammar"; ObjectID = "216"; */
-"216.title" = "Spelling en Grammatica";
+"216.title" = "Spelling en grammatica";
 
 /* Class = "NSMenuItem"; title = "Edit"; ObjectID = "217"; */
 "217.title" = "Wijzigen";
@@ -111,13 +111,13 @@
 "218.title" = "Zoeken";
 
 /* Class = "NSMenuItem"; title = "Check Spelling While Typing"; ObjectID = "219"; */
-"219.title" = "Spelling en Grammatica Controleren Tijdens Schrijven";
+"219.title" = "Spelling en grammatica controleren tijdens schrijven";
 
 /* Class = "NSMenu"; title = "Find"; ObjectID = "220"; */
 "220.title" = "Zoeken";
 
 /* Class = "NSMenuItem"; title = "Use Selection for Find"; ObjectID = "221"; */
-"221.title" = "Selectie Gebruiken om te Zoeken";
+"221.title" = "Selectie gebruiken om te zoeken";
 
 /* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "239"; */
 "239.title" = "Zoom";
@@ -129,13 +129,13 @@
 "296.title" = "Beeld";
 
 /* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "297"; */
-"297.title" = "Werkbalk Tonen";
+"297.title" = "Werkbalk tonen";
 
 /* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "298"; */
-"298.title" = "Werkbalk Aanpassen...";
+"298.title" = "Werkbalk anpassen...";
 
 /* Class = "NSMenuItem"; title = "Check Grammar With Spelling"; ObjectID = "346"; */
-"346.title" = "Grammatica Controleren met Spelling";
+"346.title" = "Grammatica controleren met spelling";
 
 /* Class = "NSMenuItem"; title = "Substitutions"; ObjectID = "348"; */
 "348.title" = "Correcties";
@@ -144,13 +144,13 @@
 "349.title" = "Correcties";
 
 /* Class = "NSMenuItem"; title = "Smart Copy/Paste"; ObjectID = "350"; */
-"350.title" = "Slim Knippen/Plakken";
+"350.title" = "Slim knippen/plakken";
 
 /* Class = "NSMenuItem"; title = "Smart Quotes"; ObjectID = "351"; */
-"351.title" = "Slimme Citaten";
+"351.title" = "Slimme citaten";
 
 /* Class = "NSMenuItem"; title = "Smart Links"; ObjectID = "354"; */
-"354.title" = "Slimme Links";
+"354.title" = "Slimme koppelingen";
 
 /* Class = "NSMenuItem"; title = "Transformations"; ObjectID = "450"; */
 "450.title" = "Transformaties";
@@ -159,28 +159,28 @@
 "451.title" = "Transformatie";
 
 /* Class = "NSMenuItem"; title = "Make Upper Case"; ObjectID = "452"; */
-"452.title" = "In Hoofdletters";
+"452.title" = "In hoofdletters";
 
 /* Class = "NSMenuItem"; title = "Correct Spelling Automatically"; ObjectID = "454"; */
-"454.title" = "Automatisch Spelling Corrigeren";
+"454.title" = "Automatisch spelling corrigeren";
 
 /* Class = "NSMenuItem"; title = "Show Substitutions"; ObjectID = "457"; */
-"457.title" = "Correcties Tonen";
+"457.title" = "Correcties tonen";
 
 /* Class = "NSMenuItem"; title = "Smart Dashes"; ObjectID = "460"; */
-"460.title" = "Slimme Strepen";
+"460.title" = "Slimme strepen";
 
 /* Class = "NSMenuItem"; title = "Text Replacement"; ObjectID = "462"; */
-"462.title" = "Tekst Vervanging";
+"462.title" = "Tekstvervanging";
 
 /* Class = "NSMenuItem"; title = "Make Lower Case"; ObjectID = "465"; */
-"465.title" = "In Kleine Letters";
+"465.title" = "In kleine letters";
 
 /* Class = "NSMenuItem"; title = "Capitalize"; ObjectID = "466"; */
-"466.title" = "In Hoofdletters";
+"466.title" = "In hoofdletters";
 
 /* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "485"; */
-"485.title" = "Plakken met Zelfde Opmaak";
+"485.title" = "Plakken met zelfde opmaak";
 
 /* Class = "NSMenuItem"; title = "Help"; ObjectID = "490"; */
 "490.title" = "Help";
@@ -189,16 +189,13 @@
 "491.title" = "Help";
 
 /* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring Help";
+"492.title" = "Ring-hulp";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Vervangen";
 
-/* Class = "NSMenuItem"; title = "Setup Ring"; ObjectID = "589"; */
-"589.title" = "Setup Ring";
-
 /* Class = "NSMenuItem"; title = "Check for Update..."; ObjectID = "593"; */
-"593.title" = "Zoeken naar Updates...";
+"593.title" = "Zoeken naar updates...";
 
 /* Class = "NSMenuItem"; title = "Show"; ObjectID = "12w-Fz-Scs"; */
 "12w-Fz-Scs.title" = "Tonen";
diff --git a/ui/nl.lproj/MigrateRingAccountsWindow.strings b/ui/nl.lproj/MigrateRingAccountsWindow.strings
new file mode 100644
index 0000000..c596f4b
--- /dev/null
+++ b/ui/nl.lproj/MigrateRingAccountsWindow.strings
@@ -0,0 +1,48 @@
+
+/* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
+"1ob-x1-u74.title" = "Accountmigratie voltooid";
+
+/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "Ring-ID";
+
+/* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "De volgende account moet gemigreerd worden naar het nieuwe Ring-accountformaat:\\nAlias:\\nID:\\nOm door te gaan met de migratie moet je een wachtwoord voor je account kiezen. Dit wachtwoord zal gebruikt worden om je hoofdsleutel te versleutelen. Het wachtwoord wordt vereist om nieuwe apparaten aan je Ring-account toe te voegen. Als je nog niet klaar bent om een wachtwoord te kiezen kan je Ring sluiten en de migratie later verderzetten.";
+
+/* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
+"8K3-9Z-MKH.title" = "Accountmigratiefout";
+
+/* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
+"C2l-rz-Gqt.title" = "Je account is succesvol gemigreerd.";
+
+/* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
+"ITE-yD-CTb.title" = "Deze account verwijderen";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
+"KuO-oT-zhY.placeholderString" = "Bevestig je nieuw wachtwoord...";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
+"PT7-XI-WDR.title" = "Oké";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Venster";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
+"VN1-A3-RIh.title" = "Oké";
+
+/* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
+"aOa-1q-AZe.title" = "Bevestiging";
+
+/* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
+"e7n-Ev-bK7.placeholderString" = "foutlabel";
+
+/* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
+"rW5-Il-5YD.title" = "Migreren";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
+"vwh-K9-3O9.title" = "Wachtwoord";
+
+/* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
+"wmv-sA-Mlh.title" = "Accountmigratie vereist";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
+"xqz-Uz-hqU.placeholderString" = "Wachtwoord...";
diff --git a/ui/nl.lproj/PersonLinker.strings b/ui/nl.lproj/PersonLinker.strings
index 34eaf6e..032e7ba 100644
--- a/ui/nl.lproj/PersonLinker.strings
+++ b/ui/nl.lproj/PersonLinker.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Jcn-cg-rbR"; */
-"Jcn-cg-rbR.placeholderString" = "Rol Tonen";
+"Jcn-cg-rbR.placeholderString" = "Rol tonen";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "M4f-N4-msh"; */
 "M4f-N4-msh.title" = "Tekstvak";
@@ -18,7 +18,7 @@
 "qZc-Z2-TpP.title" = "Aanmaken";
 
 /* Class = "NSTextFieldCell"; title = "New Contact"; ObjectID = "v7b-de-MVd"; */
-"v7b-de-MVd.title" = "Nieuw Contact";
+"v7b-de-MVd.title" = "Nieuw contact";
 
 /* Class = "NSTextFieldCell"; placeholderString = "First name..."; ObjectID = "vyb-95-XaF"; */
 "vyb-95-XaF.placeholderString" = "Voornaam...";
diff --git a/ui/nl.lproj/RegisterNameWindow.strings b/ui/nl.lproj/RegisterNameWindow.strings
new file mode 100644
index 0000000..d023369
--- /dev/null
+++ b/ui/nl.lproj/RegisterNameWindow.strings
@@ -0,0 +1,36 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "Vereist*";
+
+/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
+"9gi-0u-67t.title" = "Andere gebruikers kunnen dit in plaats van je Ring-ID gebruiken";
+
+/* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
+"Aeh-tK-RjX.title" = "Er is een fout opgetreden bij de registratie van je gebruikersnaam";
+
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Voer je Ring-accountwachtwoord in";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
+"JWw-7m-ywL.title" = "Venster";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "Even geduld aub...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
+"bdC-Uc-Qhs.placeholderString" = "Gebruikersnaam...";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
+"cbA-c2-LlV.title" = "Annuleren";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "eoS-s7-b3w"; */
+"eoS-s7-b3w.title" = "Annuleren";
+
+/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "fOn-FV-2x8"; */
+"fOn-FV-2x8.title" = "Oké";
+
+/* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
+"lT3-Bh-MnL.title" = "Registreren";
+
+/* Class = "NSTextFieldCell"; title = "Register username on the blockchain"; ObjectID = "tje-EZ-ZPI"; */
+"tje-EZ-ZPI.title" = "Gebruikersnaam registreren op de blokketen";
diff --git a/ui/nl.lproj/RingWindow.strings b/ui/nl.lproj/RingWindow.strings
index aa87895..ffd36f9 100644
--- a/ui/nl.lproj/RingWindow.strings
+++ b/ui/nl.lproj/RingWindow.strings
@@ -20,11 +20,11 @@
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
 "GAa-pQ-t4g.title" = "Tekstvak";
 
-/* Class = "NSBox"; title = "Box"; ObjectID = "Pav-Bw-GgK"; */
-"Pav-Bw-GgK.title" = "Vak";
+/* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
+"Pav-Bw-GgK.title" = "Titel";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
-"Q1F-xo-N3e.placeholderString" = "Rol Tonen";
+"Q1F-xo-N3e.placeholderString" = "Rol tonen";
 
 /* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
 "UKP-Et-CT0.placeholderString" = "datum";
@@ -33,7 +33,7 @@
 "Wi9-Zd-O1N.label" = "Geschiedenis";
 
 /* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Dit is uw RingID.\nDeel hem met uw vrienden!";
+"Xb9-UT-M2F.title" = "Dit is uw Ring-ID.\nDeel hem met uw vrienden!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacten";
@@ -45,7 +45,7 @@
 "d5o-nL-fRP.placeholderString" = "Categorie";
 
 /* Class = "NSTextFieldCell"; title = "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."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is een veilige en gedistribueerde spraak, video en chat communicatie platform dat geen centrale server vereist en laat de kracht van privacy in handen van de gebruiker.";
+"eln-Vm-t0d.title" = "Ring is een veilig en gedistribueerd spraak-, video- en chatcommunicatieplatform dat geen centrale server vereist en de kracht van privacy in handen van de gebruiker laat.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Categorie";
@@ -63,7 +63,7 @@
 "sGB-x7-gig.placeholderString" = "n";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "uSw-g5-kte"; */
-"uSw-g5-kte.placeholderString" = "Rol Tonen";
+"uSw-g5-kte.placeholderString" = "Rol tonen";
 
 /* Class = "NSSearchFieldCell"; placeholderString = "Name, ringID"; ObjectID = "vvE-nM-kSl"; */
-"vvE-nM-kSl.placeholderString" = "Naam, Ring ID";
+"vvE-nM-kSl.placeholderString" = "Naam, Ring-ID";
diff --git a/ui/nl.lproj/RingWizard.strings b/ui/nl.lproj/RingWizard.strings
index 82cc866..204afa6 100644
--- a/ui/nl.lproj/RingWizard.strings
+++ b/ui/nl.lproj/RingWizard.strings
@@ -1,36 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Choose your own certificates"; ObjectID = "4ls-Yq-mDp"; */
-"4ls-Yq-mDp.title" = "Kies uw eigen certificaten";
-
-/* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "5Z7-Wi-530"; */
-"5Z7-Wi-530.placeholderString" = "'Onbekend' wanneer leeg...";
-
-/* Class = "NSTextFieldCell"; title = "Advanced security (optional)"; ObjectID = "Gnn-K9-PTH"; */
-"Gnn-K9-PTH.title" = "Geavanceerde beveiliging (optioneel)";
-
-/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "Hsc-U9-2RV"; */
-"Hsc-U9-2RV.placeholderString" = "Wachtwoord...";
-
-/* Class = "NSButtonCell"; title = "Share"; ObjectID = "Kwr-LJ-K8C"; */
-"Kwr-LJ-K8C.title" = "Delen";
-
-/* Class = "NSTextFieldCell"; title = "Certificate Authority list"; ObjectID = "SpA-zX-ytE"; */
-"SpA-zX-ytE.title" = "Lijst van certificeringsinstanties";
-
-/* Class = "NSTextFieldCell"; title = "User Certificate"; ObjectID = "V1U-ew-Ge2"; */
-"V1U-ew-Ge2.title" = "Gebruikerscertificaat";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Choose custom certificates"; ObjectID = "aZl-bU-psB"; */
-"aZl-bU-psB.ibShadowedToolTip" = "Kies aangepaste certificaten";
-
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "meL-TZ-VQO"; */
-"meL-TZ-VQO.title" = "Kies uw gebruikersnaam";
-
-/* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "poP-JD-MDa"; */
-"poP-JD-MDa.title" = "Geheime sleutel";
-
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "uqu-uh-Wao"; */
-"uqu-uh-Wao.title" = "Welkom bij Ring";
-
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "wDw-Ut-RUm"; */
-"wDw-Ut-RUm.title" = "Volgende";
+/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Welkom bij Ring";
diff --git a/ui/nl.lproj/RingWizardChoose.strings b/ui/nl.lproj/RingWizardChoose.strings
new file mode 100644
index 0000000..be053d3
--- /dev/null
+++ b/ui/nl.lproj/RingWizardChoose.strings
@@ -0,0 +1,9 @@
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "YJ3-7G-cU1"; */
+"YJ3-7G-cU1.title" = "Annuleren";
+
+/* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
+"Z9K-mD-ucr.title" = "Dit apparaat aan een account koppelen";
+
+/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Een Ring-account aanmaken";
diff --git a/ui/nl.lproj/RingWizardLinkAccount.strings b/ui/nl.lproj/RingWizardLinkAccount.strings
new file mode 100644
index 0000000..9181d93
--- /dev/null
+++ b/ui/nl.lproj/RingWizardLinkAccount.strings
@@ -0,0 +1,27 @@
+
+/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Voer je PIN-code in";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
+"4ev-TK-8Yt.title" = "Annuleren";
+
+/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Volgende";
+
+/* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
+"DyG-SJ-U1Q.title" = "Er is een fout opgetreden, controleer je wachtwoord en PIN-code.";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
+"M4C-GY-B6t.title" = "Even geduld aub...";
+
+/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Voer je Ring-accountwachtwoord in";
+
+/* Class = "NSTextFieldCell"; title = "To link this device to another account, you first need to obtain a pin code.  To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and select \"Link another device to this account\".  You will get the necessary pin to complete this form. The Pin is only valid for 10 minutes."; ObjectID = "dJ0-Rk-Rqr"; */
+"dJ0-Rk-Rqr.title" = "Om dit apparaat aan een andere account te koppelen moet je eerst een PIN-code verkrijgen.\nGa om de PIN-code te genereren naar de accountbeheerinstellingen van een vorig apparaat, kies de Ring-account die je wil gebruiken en selecteer \"Een ander apparaat aan deze account koppelen\".\nJe zal de PIN-code krijgen die je nodig hebt om dit proces te voltooien. De PIN-code is slechts 10 minuten geldig.";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
+"t12-O0-kcf.title" = "Annuleren";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
+"uhy-DE-TKw.title" = "Annuleren";
diff --git a/ui/nl.lproj/RingWizardNewAccount.strings b/ui/nl.lproj/RingWizardNewAccount.strings
new file mode 100644
index 0000000..cf187da
--- /dev/null
+++ b/ui/nl.lproj/RingWizardNewAccount.strings
@@ -0,0 +1,36 @@
+
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. Other people can use it to call you."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "Als je dit aanvinkt zal je een unieke gebruikersnaam op het Ring-netwerk registreren. Andere personen kunnen het gebruiken om je te bellen.";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
+"1TO-Ov-S8j.placeholderString" = "Vereist*";
+
+/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register name publicly (experimental)";
+
+/* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Kies je wachtwoord";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
+"BCg-5V-Ek4.placeholderString" = "Vereist*";
+
+/* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
+"YIN-YL-JBs.title" = "Even geduld aub...";
+
+/* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
+"fEY-eO-HwI.title" = "Herhaal je wachtwoord";
+
+/* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
+"gEy-ak-Cgq.placeholderString" = "'Onbekend' wanneer leeg...";
+
+/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Kies uw gebruikersnaam";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
+"v7f-52-GJA.title" = "Annuleren";
+
+/* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
+"zUH-kc-cik.title" = "Je wachtwoord moet minstens 6 tekens bevatten. Het wordt gebruikt om je accountgegevens te versleutelen en nieuwe apparaten aan je account te koppelen.";
+
+/* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
+"zfA-n9-V4X.title" = "Aanmaken";