diff --git a/po/briar-gtk.pot b/po/briar-gtk.pot
index 1bbfa795dd482c23c796f8f03321c2217888e198..5a03517d358711260d5c36e98b15d722209bb063 100644
--- a/po/briar-gtk.pot
+++ b/po/briar-gtk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-07 01:31+0100\n"
+"POT-Creation-Date: 2019-12-09 01:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,28 +25,28 @@ msgstr ""
 msgid "Enter the link from your contact here"
 msgstr ""
 
-#: ../data/ui/add_contact.ui:63
-msgctxt "link exchange page: button – initiate pairing"
-msgid "Continue"
+#: ../data/ui/add_contact.ui:53
+msgctxt "link exchange: their link input field"
+msgid "Contact's link"
 msgstr ""
 
-#: ../data/ui/add_contact.ui:83 ../data/ui/login.ui:23 ../data/ui/setup.ui:64
-msgid "Password"
+#: ../data/ui/add_contact.ui:64
+msgctxt "link exchange: button – initiate pairing"
+msgid "Continue"
 msgstr ""
 
-#: ../data/ui/add_contact.ui:94 ../data/ui/setup.ui:75
-msgctxt "registration page: password input field"
-msgid "Choose your password"
+#: ../data/ui/add_contact.ui:84
+msgid "Give your contact a nickname. Only you can see it."
 msgstr ""
 
-#: ../data/ui/add_contact.ui:105 ../data/ui/setup.ui:86
-msgctxt "registration page: password input field"
-msgid "Confirm your password"
+#: ../data/ui/add_contact.ui:94
+msgctxt "remote contact adding: alias input field"
+msgid "Enter a nickname"
 msgstr ""
 
-#: ../data/ui/add_contact.ui:116 ../data/ui/setup.ui:97
-msgctxt "registration page: button"
-msgid "Create Account"
+#: ../data/ui/add_contact.ui:105
+msgctxt "remote contact adding: button"
+msgid "Add Contact"
 msgstr ""
 
 #: ../data/ui/chat.ui:29
@@ -54,21 +54,58 @@ msgctxt "chat page: input field"
 msgid "Type Message"
 msgstr ""
 
-#: ../data/ui/login.ui:44
-msgctxt "login page: button"
-msgid "Sign in"
+#: ../data/ui/login.ui:21 ../data/ui/registration.ui:102
+msgid "Password"
+msgstr ""
+
+#: ../data/ui/login.ui:55
+msgid "Couldn't log in"
 msgstr ""
 
-#: ../data/ui/setup.ui:23
-msgid "Nickname"
+#: ../data/ui/login.ui:110
+msgid "Log in"
 msgstr ""
 
-#: ../data/ui/setup.ui:33
-msgctxt "registration page: input field"
+#: ../data/ui/login.ui:131
+msgid "Logging in"
+msgstr ""
+
+#: ../data/ui/registration.ui:32
+msgid "Welcome to Briar"
+msgstr ""
+
+#: ../data/ui/registration.ui:60
 msgid "Choose your nickname"
 msgstr ""
 
-#: ../data/ui/setup.ui:44
-msgctxt "registration page: button – from username to passwords"
+#: ../data/ui/registration.ui:74
+msgid "The nickname may not be empty."
+msgstr ""
+
+#: ../data/ui/registration.ui:121
+msgid "Confirm Password"
+msgstr ""
+
+#: ../data/ui/registration.ui:169
+msgid "The passwords do not match"
+msgstr ""
+
+#: ../data/ui/registration.ui:225
 msgid "Next"
 msgstr ""
+
+#: ../data/ui/registration.ui:245
+msgid "Passwords"
+msgstr ""
+
+#: ../data/ui/registration.ui:267
+msgid "Create Account"
+msgstr ""
+
+#: ../data/ui/registration.ui:288
+msgid "Creating Account"
+msgstr ""
+
+#: ../src/briar/gtk/containers/registration.py:135
+msgid "Couldn't register account"
+msgstr ""
diff --git a/po/de.po b/po/de.po
index 6d6943009dcf2c7fbe7a3d7a6d4cdbf9d66f3a57..9b4c90efb6656f3fad6cd80a81caa67060380d05 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-07 01:31+0100\n"
+"POT-Creation-Date: 2019-12-09 01:26+0100\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,50 +15,114 @@ msgstr ""
 msgid "Enter the link from your contact here"
 msgstr ""
 
-#: ../data/ui/add_contact.ui:63
-msgctxt "link exchange page: button – initiate pairing"
-msgid "Continue"
+#: ../data/ui/add_contact.ui:53
+msgctxt "link exchange: their link input field"
+msgid "Contact's link"
 msgstr ""
 
-#: ../data/ui/add_contact.ui:83 ../data/ui/login.ui:23 ../data/ui/setup.ui:64
-msgid "Password"
-msgstr "Passwort"
+#: ../data/ui/add_contact.ui:64
+msgctxt "link exchange: button – initiate pairing"
+msgid "Continue"
+msgstr ""
 
-#: ../data/ui/add_contact.ui:94 ../data/ui/setup.ui:75
-msgctxt "registration page: password input field"
-msgid "Choose your password"
-msgstr "Wähle Dein Passwort"
+#: ../data/ui/add_contact.ui:84
+msgid "Give your contact a nickname. Only you can see it."
+msgstr ""
 
-#: ../data/ui/add_contact.ui:105 ../data/ui/setup.ui:86
-msgctxt "registration page: password input field"
-msgid "Confirm your password"
-msgstr "Bestätige Dein Passwort"
+#: ../data/ui/add_contact.ui:94
+msgctxt "remote contact adding: alias input field"
+msgid "Enter a nickname"
+msgstr ""
 
-#: ../data/ui/add_contact.ui:116 ../data/ui/setup.ui:97
-msgctxt "registration page: button"
-msgid "Create Account"
-msgstr "Account erstellen"
+#: ../data/ui/add_contact.ui:105
+msgctxt "remote contact adding: button"
+msgid "Add Contact"
+msgstr ""
 
 #: ../data/ui/chat.ui:29
 msgctxt "chat page: input field"
 msgid "Type Message"
 msgstr "Nachricht eingeben"
 
-#: ../data/ui/login.ui:44
-msgctxt "login page: button"
-msgid "Sign in"
-msgstr "Login"
+#: ../data/ui/login.ui:21 ../data/ui/registration.ui:102
+msgid "Password"
+msgstr "Passwort"
+
+#: ../data/ui/login.ui:55
+msgid "Couldn't log in"
+msgstr ""
+
+#: ../data/ui/login.ui:110
+msgid "Log in"
+msgstr ""
+
+#: ../data/ui/login.ui:131
+msgid "Logging in"
+msgstr ""
 
-#: ../data/ui/setup.ui:23
-msgid "Nickname"
-msgstr "Nutzername"
+#: ../data/ui/registration.ui:32
+msgid "Welcome to Briar"
+msgstr "Willkommen bei Briar"
 
-#: ../data/ui/setup.ui:33
-msgctxt "registration page: input field"
+#: ../data/ui/registration.ui:60
 msgid "Choose your nickname"
-msgstr "Wähle Deinen Benutzernamen"
+msgstr "Wähle deinen Benutzernamen aus"
 
-#: ../data/ui/setup.ui:44
-msgctxt "registration page: button – from username to passwords"
+#: ../data/ui/registration.ui:74
+msgid "The nickname may not be empty."
+msgstr "Der Benutzername darf nicht leer sein."
+
+#: ../data/ui/registration.ui:121
+msgid "Confirm Password"
+msgstr "Passwort bestätigen"
+
+#: ../data/ui/registration.ui:169
+msgid "The passwords do not match"
+msgstr "Die Passwörter stimmen nicht überein"
+
+#: ../data/ui/registration.ui:225
 msgid "Next"
 msgstr "Weiter"
+
+#: ../data/ui/registration.ui:245
+msgid "Passwords"
+msgstr "Passwörter"
+
+#: ../data/ui/registration.ui:267
+msgid "Create Account"
+msgstr "Account erstellen"
+
+#: ../data/ui/registration.ui:288
+msgid "Creating Account"
+msgstr "Erstelle Account"
+
+#: ../src/briar/gtk/containers/registration.py:135
+msgid "Couldn't register account"
+msgstr ""
+
+#~ msgctxt "login page: button"
+#~ msgid "Sign in"
+#~ msgstr "Login"
+
+#~ msgctxt "registration page: password input field"
+#~ msgid "Choose your password"
+#~ msgstr "Wähle Dein Passwort"
+
+#~ msgctxt "registration page: password input field"
+#~ msgid "Confirm your password"
+#~ msgstr "Bestätige Dein Passwort"
+
+#~ msgctxt "registration page: button"
+#~ msgid "Create Account"
+#~ msgstr "Account erstellen"
+
+#~ msgid "Nickname"
+#~ msgstr "Nutzername"
+
+#~ msgctxt "registration page: input field"
+#~ msgid "Choose your nickname"
+#~ msgstr "Wähle Deinen Benutzernamen"
+
+#~ msgctxt "registration page: button – from username to passwords"
+#~ msgid "Next"
+#~ msgstr "Weiter"
diff --git a/po/es.po b/po/es.po
index 80f9fe8414ba1afd1a61505070030d05f31ffbf4..62ed0697042d31238999f98f2fdc88237871269f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-07 01:31+0100\n"
+"POT-Creation-Date: 2019-12-09 01:26+0100\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,50 +15,110 @@ msgstr ""
 msgid "Enter the link from your contact here"
 msgstr ""
 
-#: ../data/ui/add_contact.ui:63
-msgctxt "link exchange page: button – initiate pairing"
-msgid "Continue"
+#: ../data/ui/add_contact.ui:53
+msgctxt "link exchange: their link input field"
+msgid "Contact's link"
 msgstr ""
 
-#: ../data/ui/add_contact.ui:83 ../data/ui/login.ui:23 ../data/ui/setup.ui:64
-msgid "Password"
-msgstr "Contraseña"
+#: ../data/ui/add_contact.ui:64
+msgctxt "link exchange: button – initiate pairing"
+msgid "Continue"
+msgstr ""
 
-#: ../data/ui/add_contact.ui:94 ../data/ui/setup.ui:75
-msgctxt "registration page: password input field"
-msgid "Choose your password"
-msgstr "Elegir tu contraseña"
+#: ../data/ui/add_contact.ui:84
+msgid "Give your contact a nickname. Only you can see it."
+msgstr ""
 
-#: ../data/ui/add_contact.ui:105 ../data/ui/setup.ui:86
-msgctxt "registration page: password input field"
-msgid "Confirm your password"
-msgstr "Confirmar tu contraseña"
+#: ../data/ui/add_contact.ui:94
+msgctxt "remote contact adding: alias input field"
+msgid "Enter a nickname"
+msgstr ""
 
-#: ../data/ui/add_contact.ui:116 ../data/ui/setup.ui:97
-msgctxt "registration page: button"
-msgid "Create Account"
-msgstr "Crear cuenta"
+#: ../data/ui/add_contact.ui:105
+msgctxt "remote contact adding: button"
+msgid "Add Contact"
+msgstr ""
 
 #: ../data/ui/chat.ui:29
 msgctxt "chat page: input field"
 msgid "Type Message"
 msgstr ""
 
-#: ../data/ui/login.ui:44
-msgctxt "login page: button"
-msgid "Sign in"
+#: ../data/ui/login.ui:21 ../data/ui/registration.ui:102
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../data/ui/login.ui:55
+msgid "Couldn't log in"
+msgstr ""
+
+#: ../data/ui/login.ui:110
+msgid "Log in"
+msgstr ""
+
+#: ../data/ui/login.ui:131
+msgid "Logging in"
 msgstr ""
 
-#: ../data/ui/setup.ui:23
-msgid "Nickname"
-msgstr "Nombre"
+#: ../data/ui/registration.ui:32
+msgid "Welcome to Briar"
+msgstr ""
 
-#: ../data/ui/setup.ui:33
-msgctxt "registration page: input field"
+#: ../data/ui/registration.ui:60
 msgid "Choose your nickname"
-msgstr "Elegir tu nombre"
+msgstr ""
+
+#: ../data/ui/registration.ui:74
+msgid "The nickname may not be empty."
+msgstr ""
 
-#: ../data/ui/setup.ui:44
-msgctxt "registration page: button – from username to passwords"
+#: ../data/ui/registration.ui:121
+msgid "Confirm Password"
+msgstr ""
+
+#: ../data/ui/registration.ui:169
+msgid "The passwords do not match"
+msgstr ""
+
+#: ../data/ui/registration.ui:225
 msgid "Next"
-msgstr "Seguir"
+msgstr ""
+
+#: ../data/ui/registration.ui:245
+msgid "Passwords"
+msgstr ""
+
+#: ../data/ui/registration.ui:267
+msgid "Create Account"
+msgstr ""
+
+#: ../data/ui/registration.ui:288
+msgid "Creating Account"
+msgstr ""
+
+#: ../src/briar/gtk/containers/registration.py:135
+msgid "Couldn't register account"
+msgstr ""
+
+#~ msgctxt "registration page: password input field"
+#~ msgid "Choose your password"
+#~ msgstr "Elegir tu contraseña"
+
+#~ msgctxt "registration page: password input field"
+#~ msgid "Confirm your password"
+#~ msgstr "Confirmar tu contraseña"
+
+#~ msgctxt "registration page: button"
+#~ msgid "Create Account"
+#~ msgstr "Crear cuenta"
+
+#~ msgid "Nickname"
+#~ msgstr "Nombre"
+
+#~ msgctxt "registration page: input field"
+#~ msgid "Choose your nickname"
+#~ msgstr "Elegir tu nombre"
+
+#~ msgctxt "registration page: button – from username to passwords"
+#~ msgid "Next"
+#~ msgstr "Seguir"