diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
deleted file mode 100644
index 2f02da71d7..0000000000
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
deleted file mode 100644
index a5b65d62f5..0000000000
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
deleted file mode 100644
index 6a2dad569c..0000000000
--- a/vector/src/main/res/layout/fragment_login_reset_password_2.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
deleted file mode 100644
index fa3aa74285..0000000000
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
deleted file mode 100644
index d0e7a447cc..0000000000
--- a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
deleted file mode 100644
index 9113e5e84b..0000000000
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
deleted file mode 100644
index 6038cfaedd..0000000000
--- a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_signin_password_2.xml b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
deleted file mode 100644
index c70982f209..0000000000
--- a/vector/src/main/res/layout/fragment_login_signin_password_2.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
deleted file mode 100644
index 61f565e093..0000000000
--- a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_signin_username_2.xml b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
deleted file mode 100644
index acba8dd7e1..0000000000
--- a/vector/src/main/res/layout/fragment_login_signin_username_2.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_signup_password_2.xml b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
deleted file mode 100644
index 33730e92cb..0000000000
--- a/vector/src/main/res/layout/fragment_login_signup_password_2.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
deleted file mode 100644
index 6eeff13d86..0000000000
--- a/vector/src/main/res/layout/fragment_login_signup_username_2.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
deleted file mode 100644
index b7010ba4da..0000000000
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_sso_only_2.xml b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
deleted file mode 100644
index baa05ee30f..0000000000
--- a/vector/src/main/res/layout/fragment_login_sso_only_2.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
deleted file mode 100644
index 18b7df3880..0000000000
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
deleted file mode 100644
index 15046afb61..0000000000
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index f204276a7f..89ecf8a038 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -523,7 +523,9 @@
This phone number is already defined.
Forgot password?
This homeserver would like to make sure you are not a robot
- The email address linked to your account must be entered.
+
+
+ The email address linked to your account must be entered.
Failed to verify email address: make sure you clicked the link in the email
Email not verified, check your inbox
"Please review and accept the policies of this homeserver:"
diff --git a/vector/src/main/res/values/strings_login_v2.xml b/vector/src/main/res/values/strings_login_v2.xml
deleted file mode 100644
index c84455a665..0000000000
--- a/vector/src/main/res/values/strings_login_v2.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
- Welcome back %s!
- Please enter your password
- Please enter your Matrix identifier
- Matrix identifiers start with @, for instance @alice:server.org
- If you do not know your Matrix identifier, or if your account has been created using Single Sign On (for instance using a Google account), or if you want to connect using your simple name, or an email associated to your account, you have to select your server first.
- Choose a server
- Please choose a server
- Please select your server
- Please choose a password
- Please choose a new password
- Your Matrix identifier
- Press back to change
- Choose a password
- Enter an email associated to your Matrix account
- Choose a new password
- Please choose an identifier
- Once your account is created, your identifier cannot be modified. However you will be able to change your display name.
- If you\'re not sure, select this option
- Element Matrix Server and others
- Create a new account
- I already have an account
-
- Warning: no profile information can be retrieved with this Matrix identifier. Please check that there is no mistake.
-
- We just sent an email to %1$s.
- Click on the link it contains to continue the account creation.
- Congratulations!
- You account %s has been successfully created.
- To complete your profile, you can set a profile image and/or a display name. This can also be done later from the settings.
- This is how your messages will appear:
- Hello Matrix world!
- Click on the image and on your name to configure them.
-
- Associate an email
- Associate an email to be able to later recover your account, in case you forget your password.
- The server %s requires you to associate an email to create an account.
-
- Associate a phone number
- Associate a phone number to optionally allow people you know to discover you.
- The server %s requires you to associate a phone number to create an account.
-
- %s about Element Matrix Service.
-
-
\ No newline at end of file