diff --git a/ui/de_DE.lproj/AccMedia.strings b/ui/de_DE.lproj/AccMedia.strings
index 0df1a3b..762e144 100644
--- a/ui/de_DE.lproj/AccMedia.strings
+++ b/ui/de_DE.lproj/AccMedia.strings
@@ -6,7 +6,7 @@
 "CO7-VF-04Q.title" = "Nach oben";
 
 /* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
-"KkI-i1-mfY.title" = "Enable ringtones";
+"KkI-i1-mfY.title" = "Klingeltöne aktivieren";
 
 /* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
 "MbZ-7X-K5I.title" = "Nach oben";
diff --git a/ui/de_DE.lproj/BackupAccountWindow.strings b/ui/de_DE.lproj/BackupAccountWindow.strings
index e646b1a..0eb00dd 100644
--- a/ui/de_DE.lproj/BackupAccountWindow.strings
+++ b/ui/de_DE.lproj/BackupAccountWindow.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
-"5Qf-em-tN4.placeholderString" = "Confirm...";
+"5Qf-em-tN4.placeholderString" = "Bestätigen...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Kennwort...";
diff --git a/ui/de_DE.lproj/GeneralPrefs.strings b/ui/de_DE.lproj/GeneralPrefs.strings
index 7016f91..a1084a4 100644
--- a/ui/de_DE.lproj/GeneralPrefs.strings
+++ b/ui/de_DE.lproj/GeneralPrefs.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSButtonCell"; title = "Keep my history for"; ObjectID = "3Pb-Ec-zl5"; */
-"3Pb-Ec-zl5.title" = "Keep my history for";
+"3Pb-Ec-zl5.title" = "Aus Verlauf entfernen";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
 "42E-UY-qlP.title" = "Monatlich";
diff --git a/ui/de_DE.lproj/Localizable.strings b/ui/de_DE.lproj/Localizable.strings
index 4c02e04..0d3694d 100644
--- a/ui/de_DE.lproj/Localizable.strings
+++ b/ui/de_DE.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "Ein Fehler trat während des Exports";
 
 /* Contextual menu action */
 "Add to contacts" = "Kontakte hinzufügen";
@@ -61,9 +61,6 @@
 /* Text shown to user when an error occur at registration */
 "Failed to perform lookup" = "Failed to perform lookup";
 
-/* Text shown to the user */
-"ID : " = "ID : ";
-
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
@@ -109,6 +106,9 @@
 /* Button title */
 "Revise Input" = "Revise Input";
 
+/* Text shown to the user */
+"RingID : " = "RingID : ";
+
 /* No comment provided by engineer. */
 "Share" = "Freigeben";
 
@@ -119,7 +119,7 @@
 "The entered username is available" = "The entered username is available";
 
 /* 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." = "The entered username is invalid. It must have at leat 3 characters and contains only lowercase alphanumeric characters.";
+"The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters." = "The entered username is invalid. It must have at least 3 characters and contain only lowercase alphanumeric characters.";
 
 /* Text shown to user when his username is already registered */
 "The entered username is not available" = "The entered username is not available";
diff --git a/ui/de_DE.lproj/RingWizard.strings b/ui/de_DE.lproj/RingWizard.strings
new file mode 100644
index 0000000..6b4e56f
--- /dev/null
+++ b/ui/de_DE.lproj/RingWizard.strings
@@ -0,0 +1,3 @@
+
+/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Willkommen bei Ring";
diff --git a/ui/de_DE.lproj/RingWizardLinkAccount.strings b/ui/de_DE.lproj/RingWizardLinkAccount.strings
index a730c20..59b7760 100644
--- a/ui/de_DE.lproj/RingWizardLinkAccount.strings
+++ b/ui/de_DE.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,39 @@
 
-/* Class = "NSTextFieldCell"; title = "Enter your pin"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your pin";
+/* Class = "NSTextFieldCell"; title = "Follow the process on the device. The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
+"2n6-m3-fbj.title" = "Follow the process on the device. The PIN is only valid for 10 minutes.";
+
+/* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
+"3ik-rY-Gig.title" = "Enter your PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Abbrechen";
 
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Weiter";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\".  "; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\".  ";
+
+/* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
+"8b8-bt-eAj.title" = "Link";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
 "DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
 
+/* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
+"GfW-ah-8U1.title" = "2. Generate a PIN code";
+
+/* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
+"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
 
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
+"Pcj-BY-tou.title" = "Abbrechen";
+
 /* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
 "U2K-fu-INc.title" = "Enter your Ring account password";
 
-/* 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" = "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.";
+/* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
+"XN4-uc-BSt.title" = "I'm ready";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "Abbrechen";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "uhy-DE-TKw"; */
-"uhy-DE-TKw.title" = "Abbrechen";
diff --git a/ui/de_DE.lproj/RingWizardNewAccount.strings b/ui/de_DE.lproj/RingWizardNewAccount.strings
index 158a051..8d0a977 100644
--- a/ui/de_DE.lproj/RingWizardNewAccount.strings
+++ b/ui/de_DE.lproj/RingWizardNewAccount.strings
@@ -1,12 +1,12 @@
 
-/* 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" = "By checking this, you will register a unique username on Ring network. Other people can use it to call you.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSButtonCell"; title = "Register name publicly (experimental)"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register name publicly (experimental)";
+/* Class = "NSButtonCell"; title = "Register public username (experimental)"; ObjectID = "AG5-GR-bii"; */
+"AG5-GR-bii.title" = "Register public username (experimental)";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
 "B6x-jj-48R.title" = "Choose your password";
@@ -23,8 +23,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
 "gEy-ak-Cgq.placeholderString" = "'Unknown' if empty...";
 
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Choose your username";
+/* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
+"gki-BR-jc3.title" = "Create your profile";
+
+/* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
+"qQl-Xn-c88.title" = "Create your account";
+
+/* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
+"tzf-88-Yn5.title" = "Enter your full name";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Abbrechen";