diff --git a/CMake b/CMake
index b32cca6..cd05493 160000
--- a/CMake
+++ b/CMake
@@ -1 +1 @@
-Subproject commit b32cca62386311ec32f16c0bbf13df446ace5873
+Subproject commit cd05493c3a43b04f26c3e3432df4283eb4509d8c
diff --git a/LoginView/src/lv_languages/de.ts b/LoginView/src/lv_languages/de.ts
index 0206015..35a6a4e 100644
--- a/LoginView/src/lv_languages/de.ts
+++ b/LoginView/src/lv_languages/de.ts
@@ -4,108 +4,86 @@
 <context>
     <name>LoginView</name>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
         <source>Create a new account</source>
         <translation>Ein neues Konto erstellen</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
-        <location filename="../LoginViewModule/LoginView.qml" line="261"/>
         <source>LogIn</source>
         <translation>Anmeldung</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="22"/>
         <source>Please fill this form to create an account</source>
         <translation>Bitte füllen Sie dieses Formular aus, um ein Konto zu erstellen</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="23"/>
         <source>Please fill this form to login in your account</source>
         <translation>Bitte füllen Sie dieses Formular aus, um sich in Ihrem Konto anzumelden</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="66"/>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="69"/>
         <source>Empy or incorrect name. Please enter your name.</source>
         <translation>Leerer oder falscher Name. Bitte geben Sie Ihren Namen ein.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="84"/>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="111"/>
         <source>Select you country</source>
         <translation>Wählen Sie Ihr Land aus</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="133"/>
         <source>EMail</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="137"/>
         <source>Empty or incorrect email address. Please enter your name.</source>
         <translation>Leere oder falsche E-Mail-Adresse. Bitte geben Sie Ihren Namen ein.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="152"/>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="156"/>
         <source>Empty or incorrect Nickname. Please enter your name.</source>
         <translation>Leerer oder falscher Spitzname. Bitte geben Sie Ihren Namen ein.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="178"/>
         <source>password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="192"/>
         <source>Confirm password</source>
         <translation>Kennwort bestätigen</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="204"/>
         <source>Forgot password</source>
         <translation>Passwort vergessen</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="225"/>
         <source>I accept the Terms of use</source>
         <translation>Ich akzeptiere die Nutzungsbedingungen</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="232"/>
         <source>Show terms of use</source>
         <translation>Nutzungsbedingungen anzeigen</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="260"/>
         <source>SignUp</source>
         <translation>Anmeldung</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="286"/>
         <source>Login In</source>
         <translation>Einloggen in</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="289"/>
         <source>Sign Up</source>
         <translation>Anmeldung</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="353"/>
         <source>Password must match the 1st field and the password cannot be empty</source>
         <translation>Das Passwort muss mit dem 1. Feld übereinstimmen und das Passwort darf nicht leer sein</translation>
     </message>
@@ -113,32 +91,26 @@
 <context>
     <name>LoginView::LVMainModel</name>
     <message>
-        <location filename="../lvmainmodel.cpp" line="204"/>
         <source>must be longer than 8 characters</source>
         <translation>muss länger als 8 Zeichen sein</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="208"/>
         <source>must contain numbers</source>
         <translation>muss Zahlen enthalten</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="212"/>
         <source>must contain small chars</source>
         <translation>muss kleine Zeichen enthalten</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="216"/>
         <source>must contain large chars</source>
         <translation>muss große Zeichen enthalten</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="220"/>
         <source>must contain extra chars (!@#$%^&amp;*)</source>
         <translation>muss zusätzliche Zeichen enthalten (!@#$%^&amp;*)</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="223"/>
         <source>Password requirements: </source>
         <translation>Passwortanforderungen:</translation>
     </message>
diff --git a/LoginView/src/lv_languages/en.ts b/LoginView/src/lv_languages/en.ts
index 613bf99..59358a5 100644
--- a/LoginView/src/lv_languages/en.ts
+++ b/LoginView/src/lv_languages/en.ts
@@ -4,108 +4,86 @@
 <context>
     <name>LoginView</name>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
         <source>Create a new account</source>
         <translation>Create a new account</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
-        <location filename="../LoginViewModule/LoginView.qml" line="260"/>
         <source>LogIn</source>
         <translation>LogIn</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="22"/>
         <source>Please fill this form to create an account</source>
         <translation>Please fill this form to create an account</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="23"/>
         <source>Please fill this form to login in your account</source>
         <translation>Please fill this form to login in your account</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="65"/>
         <source>First Name</source>
         <translation>First Name</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="83"/>
         <source>Last Name</source>
         <translation>Last Name</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="110"/>
         <source>Select you country</source>
         <translation>Select you country</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="132"/>
         <source>EMail</source>
         <translation>EMail</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="151"/>
         <source>Nickname</source>
         <translation>Nickname</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="68"/>
         <source>Empy or incorrect name. Please enter your name.</source>
         <translation>Empy or incorrect name. Please enter your name.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="136"/>
         <source>Empty or incorrect email address. Please enter your name.</source>
         <translation>Empty or incorrect email address. Please enter your name.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="155"/>
         <source>Empty or incorrect Nickname. Please enter your name.</source>
         <translation>Empty or incorrect Nickname. Please enter your name.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="177"/>
         <source>password</source>
         <translation>password</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="191"/>
         <source>Confirm password</source>
         <translation>Confirm password</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="203"/>
         <source>Forgot password</source>
         <translation>Forgot password</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="224"/>
         <source>I accept the Terms of use</source>
         <translation>I accept the Terms of use</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="231"/>
         <source>Show terms of use</source>
         <translation>Show terms of use</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="259"/>
         <source>SignUp</source>
         <translation>SignUp</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="285"/>
         <source>Login In</source>
         <translation>Login In</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="288"/>
         <source>Sign Up</source>
         <translation>Sign Up</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="352"/>
         <source>Password must match the 1st field and the password cannot be empty</source>
         <translation>Password must match the 1st field and the password cannot be empty</translation>
     </message>
@@ -113,32 +91,26 @@
 <context>
     <name>LoginView::LVMainModel</name>
     <message>
-        <location filename="../lvmainmodel.cpp" line="204"/>
         <source>must be longer than 8 characters</source>
         <translation>must be longer than 8 characters</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="208"/>
         <source>must contain numbers</source>
         <translation>must contain numbers</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="212"/>
         <source>must contain small chars</source>
         <translation>must contain small chars</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="216"/>
         <source>must contain large chars</source>
         <translation>must contain large chars</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="220"/>
         <source>must contain extra chars (!@#$%^&amp;*)</source>
         <translation>must contain extra chars (!@#$%^&amp;*)</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="223"/>
         <source>Password requirements: </source>
         <translation>Password requirements: </translation>
     </message>
diff --git a/LoginView/src/lv_languages/es.ts b/LoginView/src/lv_languages/es.ts
index 95c6670..1d27456 100644
--- a/LoginView/src/lv_languages/es.ts
+++ b/LoginView/src/lv_languages/es.ts
@@ -4,108 +4,86 @@
 <context>
     <name>LoginView</name>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
         <source>Create a new account</source>
         <translation>Crea una cuenta nueva</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
-        <location filename="../LoginViewModule/LoginView.qml" line="261"/>
         <source>LogIn</source>
         <translation>Acceso</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="22"/>
         <source>Please fill this form to create an account</source>
         <translation>Por favor complete este formulario para crear una cuenta</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="23"/>
         <source>Please fill this form to login in your account</source>
         <translation>Complete este formulario para iniciar sesión en su cuenta</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="66"/>
         <source>First Name</source>
         <translation>Primer nombre</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="69"/>
         <source>Empy or incorrect name. Please enter your name.</source>
         <translation>Nombre vacío o incorrecto. Por favor, escriba su nombre.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="84"/>
         <source>Last Name</source>
         <translation>Apellido</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="111"/>
         <source>Select you country</source>
         <translation>Selecciona tu pais</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="133"/>
         <source>EMail</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="137"/>
         <source>Empty or incorrect email address. Please enter your name.</source>
         <translation>Dirección de correo electrónico vacía o incorrecta. Por favor, escriba su nombre.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="152"/>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="156"/>
         <source>Empty or incorrect Nickname. Please enter your name.</source>
         <translation>Apodo vacío o incorrecto. Por favor, escriba su nombre.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="178"/>
         <source>password</source>
         <translation>contraseña</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="192"/>
         <source>Confirm password</source>
         <translation>Confirmar Contraseña</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="204"/>
         <source>Forgot password</source>
         <translation>Se te olvidó tu contraseña</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="225"/>
         <source>I accept the Terms of use</source>
         <translation>Acepto los términos de uso</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="232"/>
         <source>Show terms of use</source>
         <translation>Mostrar condiciones de uso</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="260"/>
         <source>SignUp</source>
         <translation>Inscribirse</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="286"/>
         <source>Login In</source>
         <translation>Iniciar sesión en</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="289"/>
         <source>Sign Up</source>
         <translation>Inscribirse</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="353"/>
         <source>Password must match the 1st field and the password cannot be empty</source>
         <translation>La contraseña debe coincidir con el primer campo y la contraseña no puede estar vacía</translation>
     </message>
@@ -113,32 +91,26 @@
 <context>
     <name>LoginView::LVMainModel</name>
     <message>
-        <location filename="../lvmainmodel.cpp" line="204"/>
         <source>must be longer than 8 characters</source>
         <translation>debe tener más de 8 caracteres</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="208"/>
         <source>must contain numbers</source>
         <translation>debe contener números</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="212"/>
         <source>must contain small chars</source>
         <translation>debe contener caracteres pequeños</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="216"/>
         <source>must contain large chars</source>
         <translation>debe contener caracteres grandes</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="220"/>
         <source>must contain extra chars (!@#$%^&amp;*)</source>
         <translation>debe contener caracteres adicionales (! @ # $% ^ &amp; *)</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="223"/>
         <source>Password requirements: </source>
         <translation>Requisitos de contraseña:</translation>
     </message>
diff --git a/LoginView/src/lv_languages/fr.ts b/LoginView/src/lv_languages/fr.ts
index 2ec62fb..9d0c8b1 100644
--- a/LoginView/src/lv_languages/fr.ts
+++ b/LoginView/src/lv_languages/fr.ts
@@ -4,108 +4,86 @@
 <context>
     <name>LoginView</name>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
         <source>Create a new account</source>
         <translation>Créer un nouveau compte</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
-        <location filename="../LoginViewModule/LoginView.qml" line="261"/>
         <source>LogIn</source>
         <translation>Connexion</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="22"/>
         <source>Please fill this form to create an account</source>
         <translation>Veuillez remplir ce formulaire pour créer un compte</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="23"/>
         <source>Please fill this form to login in your account</source>
         <translation>Veuillez remplir ce formulaire pour vous connecter à votre compte</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="66"/>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="69"/>
         <source>Empy or incorrect name. Please enter your name.</source>
         <translation>Nom vide ou incorrect. S&apos;il vous plaît entrez votre nom.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="84"/>
         <source>Last Name</source>
         <translation>Nom de famille</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="111"/>
         <source>Select you country</source>
         <translation>Sélectionnez votre pays</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="133"/>
         <source>EMail</source>
         <translation>E-mail</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="137"/>
         <source>Empty or incorrect email address. Please enter your name.</source>
         <translation>Adresse e-mail vide ou incorrecte. S&apos;il vous plaît entrez votre nom.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="152"/>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="156"/>
         <source>Empty or incorrect Nickname. Please enter your name.</source>
         <translation>Pseudo vide ou incorrect. S&apos;il vous plaît entrez votre nom.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="178"/>
         <source>password</source>
         <translation>le mot de passe</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="192"/>
         <source>Confirm password</source>
         <translation>Confirmez le mot de passe</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="204"/>
         <source>Forgot password</source>
         <translation>Mot de passe oublié</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="225"/>
         <source>I accept the Terms of use</source>
         <translation>J&apos;accepte les conditions d&apos;utilisation</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="232"/>
         <source>Show terms of use</source>
         <translation>Afficher les conditions d&apos;utilisation</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="260"/>
         <source>SignUp</source>
         <translation>S&apos;inscrire</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="286"/>
         <source>Login In</source>
         <translation>Se connecter</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="289"/>
         <source>Sign Up</source>
         <translation>S&apos;inscrire</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="353"/>
         <source>Password must match the 1st field and the password cannot be empty</source>
         <translation>Le mot de passe doit correspondre au 1er champ et le mot de passe ne peut pas être vide</translation>
     </message>
@@ -113,32 +91,26 @@
 <context>
     <name>LoginView::LVMainModel</name>
     <message>
-        <location filename="../lvmainmodel.cpp" line="204"/>
         <source>must be longer than 8 characters</source>
         <translation>doit comporter plus de 8 caractères</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="208"/>
         <source>must contain numbers</source>
         <translation>doit contenir des chiffres</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="212"/>
         <source>must contain small chars</source>
         <translation>doit contenir de petits caractères</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="216"/>
         <source>must contain large chars</source>
         <translation>doit contenir de gros caractères</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="220"/>
         <source>must contain extra chars (!@#$%^&amp;*)</source>
         <translation>doit contenir des caractères supplémentaires (!@#$%^&amp;*)</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="223"/>
         <source>Password requirements: </source>
         <translation>Exigences de mot de passe&#xa0;:</translation>
     </message>
diff --git a/LoginView/src/lv_languages/ja.ts b/LoginView/src/lv_languages/ja.ts
index 32ea70b..ef75cc1 100644
--- a/LoginView/src/lv_languages/ja.ts
+++ b/LoginView/src/lv_languages/ja.ts
@@ -4,108 +4,86 @@
 <context>
     <name>LoginView</name>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
         <source>Create a new account</source>
         <translation>新しいアカウントを作成する</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
-        <location filename="../LoginViewModule/LoginView.qml" line="260"/>
         <source>LogIn</source>
         <translation>ログインする</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="22"/>
         <source>Please fill this form to create an account</source>
         <translation>アカウントを作成するには、このフォームに記入してください</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="23"/>
         <source>Please fill this form to login in your account</source>
         <translation>アカウントにログインするには、このフォームに記入してください</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="65"/>
         <source>First Name</source>
         <translation>ファーストネーム</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="83"/>
         <source>Last Name</source>
         <translation>苗字</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="110"/>
         <source>Select you country</source>
         <translation>国を選択してください</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="132"/>
         <source>EMail</source>
         <translation>Eメール</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="151"/>
         <source>Nickname</source>
         <translation>ニックネーム</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="68"/>
         <source>Empy or incorrect name. Please enter your name.</source>
         <translation>名前が空または正しくありません。 お名前を入力してください。</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="136"/>
         <source>Empty or incorrect email address. Please enter your name.</source>
         <translation>空または間違ったメールアドレス。 お名前を入力してください。</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="155"/>
         <source>Empty or incorrect Nickname. Please enter your name.</source>
         <translation>空または間違ったニックネーム。 お名前を入力してください。</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="177"/>
         <source>password</source>
         <translation>パスワード</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="191"/>
         <source>Confirm password</source>
         <translation>パスワードを認証する</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="203"/>
         <source>Forgot password</source>
         <translation>パスワードをお忘れですか</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="224"/>
         <source>I accept the Terms of use</source>
         <translation>利用規約に同意します</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="231"/>
         <source>Show terms of use</source>
         <translation>利用規約を表示する</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="259"/>
         <source>SignUp</source>
         <translation>サインアップ</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="285"/>
         <source>Login In</source>
         <translation>ログイン</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="288"/>
         <source>Sign Up</source>
         <translation>サインアップ</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="352"/>
         <source>Password must match the 1st field and the password cannot be empty</source>
         <translation>パスワードは最初のフィールドと一致する必要があり、パスワードを空にすることはできません</translation>
     </message>
@@ -113,32 +91,26 @@
 <context>
     <name>LoginView::LVMainModel</name>
     <message>
-        <location filename="../lvmainmodel.cpp" line="204"/>
         <source>must be longer than 8 characters</source>
         <translation>8文字より長くする必要があります</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="208"/>
         <source>must contain numbers</source>
         <translation>数字が含まれている必要があります</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="212"/>
         <source>must contain small chars</source>
         <translation>小さな文字が含まれている必要があります</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="216"/>
         <source>must contain large chars</source>
         <translation>大きな文字が含まれている必要があります</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="220"/>
         <source>must contain extra chars (!@#$%^&amp;*)</source>
         <translation>追加の文字を含める必要があります(!@#$%^&*)</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="223"/>
         <source>Password requirements: </source>
         <translation>パスワード要件:</translation>
     </message>
diff --git a/LoginView/src/lv_languages/pl.ts b/LoginView/src/lv_languages/pl.ts
index 0004fa1..086d7cd 100644
--- a/LoginView/src/lv_languages/pl.ts
+++ b/LoginView/src/lv_languages/pl.ts
@@ -4,108 +4,86 @@
 <context>
     <name>LoginView</name>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
         <source>Create a new account</source>
         <translation>Stwórz nowe konto</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
-        <location filename="../LoginViewModule/LoginView.qml" line="261"/>
         <source>LogIn</source>
         <translation>Zaloguj sie</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="22"/>
         <source>Please fill this form to create an account</source>
         <translation>Wypełnij ten formularz, aby utworzyć konto</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="23"/>
         <source>Please fill this form to login in your account</source>
         <translation>Wypełnij ten formularz, aby zalogować się na swoje konto</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="66"/>
         <source>First Name</source>
         <translation>Imię</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="69"/>
         <source>Empy or incorrect name. Please enter your name.</source>
         <translation>Pusta lub nieprawidłowa nazwa. Proszę wpisać swoje imię.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="84"/>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="111"/>
         <source>Select you country</source>
         <translation>Wybierz swój kraj</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="133"/>
         <source>EMail</source>
         <translation>E-mail</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="137"/>
         <source>Empty or incorrect email address. Please enter your name.</source>
         <translation>Pusty lub nieprawidłowy adres e-mail. Proszę wpisać swoje imię.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="152"/>
         <source>Nickname</source>
         <translation>Przezwisko</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="156"/>
         <source>Empty or incorrect Nickname. Please enter your name.</source>
         <translation>Pusty lub nieprawidłowy pseudonim. Proszę wpisać swoje imię.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="178"/>
         <source>password</source>
         <translation>hasło</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="192"/>
         <source>Confirm password</source>
         <translation>Potwierdź hasło</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="204"/>
         <source>Forgot password</source>
         <translation>Zapomniałeś hasła</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="225"/>
         <source>I accept the Terms of use</source>
         <translation>Akceptuję warunki użytkowania</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="232"/>
         <source>Show terms of use</source>
         <translation>Pokaż warunki użytkowania</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="260"/>
         <source>SignUp</source>
         <translation>Zapisz się</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="286"/>
         <source>Login In</source>
         <translation>Zaloguj się</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="289"/>
         <source>Sign Up</source>
         <translation>Zapisz się</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="353"/>
         <source>Password must match the 1st field and the password cannot be empty</source>
         <translation>Hasło musi pasować do pierwszego pola i hasło nie może być puste</translation>
     </message>
@@ -113,32 +91,26 @@
 <context>
     <name>LoginView::LVMainModel</name>
     <message>
-        <location filename="../lvmainmodel.cpp" line="204"/>
         <source>must be longer than 8 characters</source>
         <translation>musi być dłuższy niż 8 znaków</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="208"/>
         <source>must contain numbers</source>
         <translation>musi zawierać liczby</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="212"/>
         <source>must contain small chars</source>
         <translation>musi zawierać małe znaki</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="216"/>
         <source>must contain large chars</source>
         <translation>musi zawierać duże znaki</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="220"/>
         <source>must contain extra chars (!@#$%^&amp;*)</source>
         <translation>musi zawierać dodatkowe znaki (!@#$%^&amp;*)</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="223"/>
         <source>Password requirements: </source>
         <translation>Wymagania dotyczące hasła:</translation>
     </message>
diff --git a/LoginView/src/lv_languages/ru.ts b/LoginView/src/lv_languages/ru.ts
index 1b0966a..25f5a75 100644
--- a/LoginView/src/lv_languages/ru.ts
+++ b/LoginView/src/lv_languages/ru.ts
@@ -4,108 +4,86 @@
 <context>
     <name>LoginView</name>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
         <source>Create a new account</source>
         <translation>Создать новый аккаунт</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
-        <location filename="../LoginViewModule/LoginView.qml" line="260"/>
         <source>LogIn</source>
         <translation>Логин</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="22"/>
         <source>Please fill this form to create an account</source>
         <translation>Пожалуйста, заполните эту форму, чтобы создать аккаунт</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="23"/>
         <source>Please fill this form to login in your account</source>
         <translation>Пожалуйста, заполните эту форму, чтобы войти в аккаунт</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="65"/>
         <source>First Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="83"/>
         <source>Last Name</source>
         <translation>Фамилия</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="110"/>
         <source>Select you country</source>
         <translation>Выберите вашу страну</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="132"/>
         <source>EMail</source>
         <translation>EMail</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="151"/>
         <source>Nickname</source>
         <translation>Никнейм</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="68"/>
         <source>Empy or incorrect name. Please enter your name.</source>
         <translation>Незаполненная строка или неподходящее имя.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="136"/>
         <source>Empty or incorrect email address. Please enter your name.</source>
         <translation>Незаполненная строка или неверный email.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="155"/>
         <source>Empty or incorrect Nickname. Please enter your name.</source>
         <translation>Незаполненная строка или некорректный никнейм.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="177"/>
         <source>password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="191"/>
         <source>Confirm password</source>
         <translation>Подтвердить Пароль</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="203"/>
         <source>Forgot password</source>
         <translation>Забыл пароль</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="224"/>
         <source>I accept the Terms of use</source>
         <translation>Я принимаю условия использования</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="231"/>
         <source>Show terms of use</source>
         <translation>Показать условия использования</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="259"/>
         <source>SignUp</source>
         <translation>Регистрация</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="285"/>
         <source>Login In</source>
         <translation>Войти</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="288"/>
         <source>Sign Up</source>
         <translation>Регистрация</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="352"/>
         <source>Password must match the 1st field and the password cannot be empty</source>
         <translation>Пароль должен соответствовать 1-му полю, и не может быть пустым.</translation>
     </message>
@@ -113,32 +91,26 @@
 <context>
     <name>LoginView::LVMainModel</name>
     <message>
-        <location filename="../lvmainmodel.cpp" line="204"/>
         <source>must be longer than 8 characters</source>
         <translation>Должен быть длиннее 8 символов</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="208"/>
         <source>must contain numbers</source>
         <translation>Должен содержать числа</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="212"/>
         <source>must contain small chars</source>
         <translation>Должен содержать строчные буквы</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="216"/>
         <source>must contain large chars</source>
         <translation>Должен содержать заглавные буквы</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="220"/>
         <source>must contain extra chars (!@#$%^&amp;*)</source>
         <translation>Должен содержать особые символы (! @ # $% ^ &amp; *)</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="223"/>
         <source>Password requirements: </source>
         <translation>Требования к паролю:</translation>
     </message>
diff --git a/LoginView/src/lv_languages/tr.ts b/LoginView/src/lv_languages/tr.ts
index 14b8c8e..5d10bf7 100644
--- a/LoginView/src/lv_languages/tr.ts
+++ b/LoginView/src/lv_languages/tr.ts
@@ -4,108 +4,86 @@
 <context>
     <name>LoginView</name>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
         <source>Create a new account</source>
         <translation>Yeni bir hesap oluştur</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
-        <location filename="../LoginViewModule/LoginView.qml" line="260"/>
         <source>LogIn</source>
         <translation>Oturum aç</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="22"/>
         <source>Please fill this form to create an account</source>
         <translation>Lütfen bir hesap oluşturmak için bu formu doldurun</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="23"/>
         <source>Please fill this form to login in your account</source>
         <translation>Lütfen hesabınıza giriş yapmak için bu formu doldurun</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="65"/>
         <source>First Name</source>
         <translation>İsim</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="83"/>
         <source>Last Name</source>
         <translation>Soyadı</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="110"/>
         <source>Select you country</source>
         <translation>Ülkenizi seçin</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="132"/>
         <source>EMail</source>
         <translation>EMail</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="151"/>
         <source>Nickname</source>
         <translation>Takma ad</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="68"/>
         <source>Empy or incorrect name. Please enter your name.</source>
         <translation>Boş veya yanlış isim. Lütfen adınızı giriniz.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="136"/>
         <source>Empty or incorrect email address. Please enter your name.</source>
         <translation>E-posta adresi boş veya yanlış. Lütfen adınızı giriniz.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="155"/>
         <source>Empty or incorrect Nickname. Please enter your name.</source>
         <translation>Boş veya yanlış Takma ad. Lütfen adınızı giriniz.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="177"/>
         <source>password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="191"/>
         <source>Confirm password</source>
         <translation>Şifreyi Onayla</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="203"/>
         <source>Forgot password</source>
         <translation>Parolanızı mı unuttunuz</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="224"/>
         <source>I accept the Terms of use</source>
         <translation>Kullanım şartlarını kabul ediyorum</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="231"/>
         <source>Show terms of use</source>
         <translation>Kullanım şartlarını göster</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="259"/>
         <source>SignUp</source>
         <translation>Kaydol</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="285"/>
         <source>Login In</source>
         <translation>Giriş yap</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="288"/>
         <source>Sign Up</source>
         <translation>Kaydol</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="352"/>
         <source>Password must match the 1st field and the password cannot be empty</source>
         <translation>Parola 1. alanla eşleşmelidir ve parola boş olamaz</translation>
     </message>
@@ -113,32 +91,26 @@
 <context>
     <name>LoginView::LVMainModel</name>
     <message>
-        <location filename="../lvmainmodel.cpp" line="204"/>
         <source>must be longer than 8 characters</source>
         <translation>8 karakterden uzun olmalıdır</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="208"/>
         <source>must contain numbers</source>
         <translation>sayı içermelidir</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="212"/>
         <source>must contain small chars</source>
         <translation>Küçük karakterler içermelidir</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="216"/>
         <source>must contain large chars</source>
         <translation>büyük karakterler içermelidir</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="220"/>
         <source>must contain extra chars (!@#$%^&amp;*)</source>
         <translation>Ekstra karakterler içermelidir (! @ # $% ^ &amp; *)</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="223"/>
         <source>Password requirements: </source>
         <translation>Parola gereksinimleri:</translation>
     </message>
diff --git a/LoginView/src/lv_languages/uk.ts b/LoginView/src/lv_languages/uk.ts
index c305f1b..785c899 100644
--- a/LoginView/src/lv_languages/uk.ts
+++ b/LoginView/src/lv_languages/uk.ts
@@ -4,108 +4,86 @@
 <context>
     <name>LoginView</name>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
         <source>Create a new account</source>
         <translation>Вимоги до пароля:</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
-        <location filename="../LoginViewModule/LoginView.qml" line="260"/>
         <source>LogIn</source>
         <translation>Логін</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="22"/>
         <source>Please fill this form to create an account</source>
         <translation>Заповніть цю форму, щоб створити обліковий запис</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="23"/>
         <source>Please fill this form to login in your account</source>
         <translation>Заповніть цю форму, щоб увійти у свій обліковий запис</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="65"/>
         <source>First Name</source>
         <translation>Ім&apos;я</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="83"/>
         <source>Last Name</source>
         <translation>Прізвище</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="110"/>
         <source>Select you country</source>
         <translation>Виберіть країну</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="132"/>
         <source>EMail</source>
         <translation>EMail</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="151"/>
         <source>Nickname</source>
         <translation>Прізвисько</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="68"/>
         <source>Empy or incorrect name. Please enter your name.</source>
         <translation>Порожня або неправильна назва. Введіть своє ім&apos;я.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="136"/>
         <source>Empty or incorrect email address. Please enter your name.</source>
         <translation>Порожня або неправильна назва. Введіть своє ім&apos;я.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="155"/>
         <source>Empty or incorrect Nickname. Please enter your name.</source>
         <translation>Порожній або неправильний псевдонім. Введіть своє ім&apos;я.</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="177"/>
         <source>password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="191"/>
         <source>Confirm password</source>
         <translation>Підтвердьте пароль</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="203"/>
         <source>Forgot password</source>
         <translation>Забули пароль</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="224"/>
         <source>I accept the Terms of use</source>
         <translation>Я приймаю умови використання</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="231"/>
         <source>Show terms of use</source>
         <translation>Показати умови використання</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="259"/>
         <source>SignUp</source>
         <translation>Реєстрація</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="285"/>
         <source>Login In</source>
         <translation>Вхід</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="288"/>
         <source>Sign Up</source>
         <translation>Зареєструйтесь</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="352"/>
         <source>Password must match the 1st field and the password cannot be empty</source>
         <translation>Пароль повинен відповідати 1-му полю, і пароль не може бути порожнім</translation>
     </message>
@@ -113,32 +91,26 @@
 <context>
     <name>LoginView::LVMainModel</name>
     <message>
-        <location filename="../lvmainmodel.cpp" line="204"/>
         <source>must be longer than 8 characters</source>
         <translation>Має містити більше 8 символів</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="208"/>
         <source>must contain numbers</source>
         <translation>Повинні містити цифри</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="212"/>
         <source>must contain small chars</source>
         <translation>Повинен містити невеликі символи</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="216"/>
         <source>must contain large chars</source>
         <translation>Повинен містити великі символи</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="220"/>
         <source>must contain extra chars (!@#$%^&amp;*)</source>
         <translation>Повинен містити додаткові символи (! @ # $% ^ &amp; *)</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="223"/>
         <source>Password requirements: </source>
         <translation>Вимоги до пароля:</translation>
     </message>
diff --git a/LoginView/src/lv_languages/zh.ts b/LoginView/src/lv_languages/zh.ts
index 8c76db0..3f52650 100644
--- a/LoginView/src/lv_languages/zh.ts
+++ b/LoginView/src/lv_languages/zh.ts
@@ -4,108 +4,86 @@
 <context>
     <name>LoginView</name>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
         <source>Create a new account</source>
         <translation>创建一个新账户</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="21"/>
-        <location filename="../LoginViewModule/LoginView.qml" line="261"/>
         <source>LogIn</source>
         <translation>登录</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="22"/>
         <source>Please fill this form to create an account</source>
         <translation>请填写此表格以创建一个帐户</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="23"/>
         <source>Please fill this form to login in your account</source>
         <translation>请填写此表格以登录您的帐户</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="66"/>
         <source>First Name</source>
         <translation>名</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="69"/>
         <source>Empy or incorrect name. Please enter your name.</source>
         <translation>名称为空或不正确。 请输入你的名字。</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="84"/>
         <source>Last Name</source>
         <translation>姓</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="111"/>
         <source>Select you country</source>
         <translation>选择您的国家</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="133"/>
         <source>EMail</source>
         <translation>电子邮件</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="137"/>
         <source>Empty or incorrect email address. Please enter your name.</source>
         <translation>电子邮件地址为空或不正确。 请输入你的名字。</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="152"/>
         <source>Nickname</source>
         <translation>昵称</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="156"/>
         <source>Empty or incorrect Nickname. Please enter your name.</source>
         <translation>空的或不正确的昵称。 请输入你的名字。</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="178"/>
         <source>password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="192"/>
         <source>Confirm password</source>
         <translation>确认密码</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="204"/>
         <source>Forgot password</source>
         <translation>忘记密码</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="225"/>
         <source>I accept the Terms of use</source>
         <translation>我接受使用条款</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="232"/>
         <source>Show terms of use</source>
         <translation>显示使用条款</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="260"/>
         <source>SignUp</source>
         <translation>报名</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="286"/>
         <source>Login In</source>
         <translation>登录</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="289"/>
         <source>Sign Up</source>
         <translation>报名</translation>
     </message>
     <message>
-        <location filename="../LoginViewModule/LoginView.qml" line="353"/>
         <source>Password must match the 1st field and the password cannot be empty</source>
         <translation>密码必须与第一个字段匹配,密码不能为空</translation>
     </message>
@@ -113,32 +91,26 @@
 <context>
     <name>LoginView::LVMainModel</name>
     <message>
-        <location filename="../lvmainmodel.cpp" line="204"/>
         <source>must be longer than 8 characters</source>
         <translation>必须长于 8 个字符</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="208"/>
         <source>must contain numbers</source>
         <translation>必须包含数字</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="212"/>
         <source>must contain small chars</source>
         <translation>必须包含小字符</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="216"/>
         <source>must contain large chars</source>
         <translation>必须包含大字符</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="220"/>
         <source>must contain extra chars (!@#$%^&amp;*)</source>
         <translation>必须包含额外的字符 (!@#$%^&amp;*)</translation>
     </message>
     <message>
-        <location filename="../lvmainmodel.cpp" line="223"/>
         <source>Password requirements: </source>
         <translation>密码要求:</translation>
     </message>