diff --git a/app/src/main/java/com/batledev/bluetask/CreateTaskActivity.kt b/app/src/main/java/com/batledev/bluetask/CreateTaskActivity.kt
index e5d0eed..a2ca0e9 100644
--- a/app/src/main/java/com/batledev/bluetask/CreateTaskActivity.kt
+++ b/app/src/main/java/com/batledev/bluetask/CreateTaskActivity.kt
@@ -112,7 +112,7 @@ class CreateTaskActivity : AppCompatActivity() {
 
         // Validate input data
         if (title.isEmpty()) {
-            editTextTitle.error = "Title required"
+            editTextTitle.error = resources.getString(R.string.error_empty_title)
             editTextTitle.requestFocus()
             return
         }
@@ -143,7 +143,8 @@ class CreateTaskActivity : AppCompatActivity() {
             }
             .addOnFailureListener { e ->
                 println("Error adding task: $e")
-                Toast.makeText(this, "Error adding task", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, resources.getString(R.string.error_create_task),
+                    Toast.LENGTH_SHORT).show()
             }
     }
 }
diff --git a/app/src/main/java/com/batledev/bluetask/MainActivity.kt b/app/src/main/java/com/batledev/bluetask/MainActivity.kt
index 846b163..6181516 100644
--- a/app/src/main/java/com/batledev/bluetask/MainActivity.kt
+++ b/app/src/main/java/com/batledev/bluetask/MainActivity.kt
@@ -199,6 +199,10 @@ class MainActivity : AppCompatActivity() {
     private fun loadTasks() {
         swipeRefreshLayout.isRefreshing = true
 
+        // Show/Hide the create task button
+        val createTaskButton = findViewById<Button>(R.id.createTaskButton)
+        createTaskButton.visibility = if (status == "active" && label.isEmpty()) View.VISIBLE else View.GONE
+
         val userId = firebaseAuth.currentUser?.uid ?: return
         var tasksRef = firestore.collection("users").document(userId)
             .collection("tasks")
diff --git a/app/src/main/java/com/batledev/bluetask/TaskAdapter.kt b/app/src/main/java/com/batledev/bluetask/TaskAdapter.kt
index 6524b89..4417aa9 100644
--- a/app/src/main/java/com/batledev/bluetask/TaskAdapter.kt
+++ b/app/src/main/java/com/batledev/bluetask/TaskAdapter.kt
@@ -44,7 +44,7 @@ class TaskAdapter(context: Context, tasks: List<Task>, private val taskActivityL
         if (task.title.isEmpty() && task.description.isEmpty()) {
             titleTextView.visibility = View.GONE
             descriptionTextView.visibility = View.VISIBLE
-            descriptionTextView.text = context.getString(R.string.empty_task_description)
+            descriptionTextView.text = context.getString(R.string.empty_title_description)
             descriptionTextView.setTypeface(null, Typeface.ITALIC)
         }
         // If the title is empty, hide the title, same for the description
diff --git a/app/src/main/java/com/batledev/bluetask/UpdateTaskActivity.kt b/app/src/main/java/com/batledev/bluetask/UpdateTaskActivity.kt
index a492af1..6a1cee3 100644
--- a/app/src/main/java/com/batledev/bluetask/UpdateTaskActivity.kt
+++ b/app/src/main/java/com/batledev/bluetask/UpdateTaskActivity.kt
@@ -174,7 +174,7 @@ class UpdateTaskActivity : AppCompatActivity() {
 
         // Validate input data
         if (title.isEmpty()) {
-            editTextTitle.error = "Title required"
+            editTextTitle.error = resources.getString(R.string.error_empty_title)
             editTextTitle.requestFocus()
             return
         }
@@ -204,7 +204,7 @@ class UpdateTaskActivity : AppCompatActivity() {
             }
             .addOnFailureListener { e ->
                 println("Error updating task : $e")
-                Toast.makeText(this, resources.getString(R.string.update_error), Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, resources.getString(R.string.error_update), Toast.LENGTH_SHORT).show()
             }
     }
 
@@ -218,25 +218,23 @@ class UpdateTaskActivity : AppCompatActivity() {
             taskRef.delete()
                 .addOnSuccessListener {
                     println("Task deleted successfully")
-                    Toast.makeText(this, resources.getString(R.string.delete_successful), Toast.LENGTH_SHORT).show()
                     setResult(RESULT_OK)
                     finish()
                 }
                 .addOnFailureListener { e ->
                     println("Error deleting task: $e")
-                    Toast.makeText(this, resources.getString(R.string.update_error), Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this, resources.getString(R.string.error_update), Toast.LENGTH_SHORT).show()
                 }
         } else {
             taskRef.update("status", "deleted")
                 .addOnSuccessListener {
                     println("Task marked as deleted successfully")
-                    Toast.makeText(this, resources.getString(R.string.trash_successful), Toast.LENGTH_SHORT).show()
                     setResult(RESULT_OK)
                     finish()
                 }
                 .addOnFailureListener { e ->
                     println("Error updating task : $e")
-                    Toast.makeText(this, resources.getString(R.string.update_error), Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this, resources.getString(R.string.error_update), Toast.LENGTH_SHORT).show()
                 }
         }
     }
@@ -249,17 +247,13 @@ class UpdateTaskActivity : AppCompatActivity() {
         val newStatus = if (taskDoc?.status == "archived") "active" else "archived"
         taskRef.update("status", newStatus)
             .addOnSuccessListener {
-                val message =
-                    if (newStatus == "archived") resources.getString(R.string.archive_successful)
-                    else resources.getString(R.string.unarchive_successful)
-                println(message)
-                Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+                println("Task archived/unarchived successfully")
                 setResult(RESULT_OK)
                 finish()
             }
             .addOnFailureListener { e ->
                 println("Error updating task : $e")
-                Toast.makeText(this, resources.getString(R.string.update_error), Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, resources.getString(R.string.error_update), Toast.LENGTH_SHORT).show()
             }
     }
 }
diff --git a/app/src/main/java/com/batledev/bluetask/authentication/AuthUtils.kt b/app/src/main/java/com/batledev/bluetask/authentication/AuthUtils.kt
index 1a0a86d..03645ee 100644
--- a/app/src/main/java/com/batledev/bluetask/authentication/AuthUtils.kt
+++ b/app/src/main/java/com/batledev/bluetask/authentication/AuthUtils.kt
@@ -53,8 +53,8 @@ object TaskUtils {
                 } catch (e: ApiException) {
                     Toast.makeText(
                         activity,
-                        "Google login/sign up failed: " + e.message,
-                        Toast.LENGTH_SHORT
+                        activity.resources.getString(R.string.error_auth_failed) + e.message,
+                        Toast.LENGTH_LONG
                     ).show()
                 }
             }
@@ -84,7 +84,8 @@ object TaskUtils {
                             val user = hashMapOf(
                                 "email" to currentUser.email,
                                 "labels" to emptyList<String>(),
-                                "createdAt" to FieldValue.serverTimestamp()
+                                "createdAt" to FieldValue.serverTimestamp(),
+                                "theme" to "dark"
                             )
                             userDoc.set(user).addOnSuccessListener { _ ->
                                 updateUI(activity, currentUser)}
@@ -95,8 +96,8 @@ object TaskUtils {
                 } else {
                     Toast.makeText(
                         activity,
-                        "Google login/sign up failed: " + task.exception!!.message,
-                        Toast.LENGTH_SHORT
+                        activity.resources.getString(R.string.error_auth_failed) + task.exception,
+                        Toast.LENGTH_LONG
                     ).show()
                 }
             }
diff --git a/app/src/main/java/com/batledev/bluetask/authentication/LoginActivity.kt b/app/src/main/java/com/batledev/bluetask/authentication/LoginActivity.kt
index 262e2da..85baae3 100644
--- a/app/src/main/java/com/batledev/bluetask/authentication/LoginActivity.kt
+++ b/app/src/main/java/com/batledev/bluetask/authentication/LoginActivity.kt
@@ -64,11 +64,11 @@ class LoginActivity : AppCompatActivity() {
 
         // Check if data is valid
         if (TextUtils.isEmpty(email)) {
-            loginEmail.error = "Email is required."
+            loginEmail.error = resources.getString(R.string.error_email_required)
             return
         }
         if (TextUtils.isEmpty(password)) {
-            loginPassword.error = "Password is required."
+            loginPassword.error = resources.getString(R.string.error_password_required)
             return
         }
 
@@ -79,10 +79,7 @@ class LoginActivity : AppCompatActivity() {
                     TaskUtils.updateUI(this, firebaseAuth.currentUser)
                 } else {
                     Toast.makeText(
-                        baseContext,
-                        "Login failed: " + task.exception?.message,
-                        Toast.LENGTH_SHORT
-                    ).show()
+                        this, resources.getString(R.string.error_auth_failed), Toast.LENGTH_LONG).show()
                 }
             }
     }
diff --git a/app/src/main/java/com/batledev/bluetask/authentication/SignupActivity.kt b/app/src/main/java/com/batledev/bluetask/authentication/SignupActivity.kt
index dfbf9bd..13d362e 100644
--- a/app/src/main/java/com/batledev/bluetask/authentication/SignupActivity.kt
+++ b/app/src/main/java/com/batledev/bluetask/authentication/SignupActivity.kt
@@ -67,7 +67,7 @@ class SignupActivity : AppCompatActivity() {
      * - Check if the password is empty
      * - Check if the password and confirm password match
      * - Create a user with the email and password
-     * - If the user is created successfully, show a toast message and update the UI
+     * - If the user is created successfully, update the UI
      */
     private fun registerUser() {
         // Get and trim the email, password and confirm password
@@ -77,15 +77,15 @@ class SignupActivity : AppCompatActivity() {
 
         // Check if data is valid
         if (TextUtils.isEmpty(email)) {
-            signupEmail.error = "Email is required."
+            signupEmail.error = resources.getString(R.string.error_email_required)
             return
         }
         if (TextUtils.isEmpty(password)) {
-            signupPassword.error = "Password is required."
+            signupPassword.error = resources.getString(R.string.error_password_required)
             return
         }
         if (password != confirmPassword) {
-            signupConfirmPassword.error = "Passwords do not match."
+            signupConfirmPassword.error = resources.getString(R.string.error_password_mismatch)
             return
         }
 
@@ -98,7 +98,8 @@ class SignupActivity : AppCompatActivity() {
                     val user = hashMapOf(
                         "email" to currentUser.email,
                         "labels" to emptyList<String>(),
-                        "createdAt" to FieldValue.serverTimestamp()
+                        "createdAt" to FieldValue.serverTimestamp(),
+                        "theme" to "dark"
                     )
                     firestore.collection("users").document(currentUser.uid)
                         .set(user)
@@ -107,10 +108,7 @@ class SignupActivity : AppCompatActivity() {
                         }
                 } else {
                     Toast.makeText(
-                        baseContext,
-                        "Registration failed: " + task.exception!!.message,
-                        Toast.LENGTH_SHORT
-                    ).show()
+                        this, resources.getString(R.string.error_auth_failed), Toast.LENGTH_LONG ).show()
                 }
             }
     }
diff --git a/app/src/main/res/layout/activity_create_task.xml b/app/src/main/res/layout/activity_create_task.xml
index 8a3e863..8a94e6e 100644
--- a/app/src/main/res/layout/activity_create_task.xml
+++ b/app/src/main/res/layout/activity_create_task.xml
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/spinnerPriority"
         android:layout_marginTop="8dp"
-        android:text="@string/selected_labels"
+        android:text="@string/labels_selected"
         android:minHeight="48dp"
         android:background="?android:attr/selectableItemBackground" />
 
@@ -76,7 +76,7 @@
         android:id="@+id/buttonColorPicker"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/add_color"
+        android:text="@string/pick_color"
         android:layout_below="@id/buttonEndDatePicker" />
 
     <!-- Add Task Button -->
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index eba1a5d..adea3f5 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -28,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="16dp"
-                android:text="@string/login_to_bluetask"
+                android:text="@string/auth_login_page_title"
                 android:textColor="?attr/colorPrimary"
                 android:textSize="24sp"
                 android:textStyle="bold" />
@@ -69,7 +69,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="16dp"
                 android:background="@drawable/button_primary"
-                android:text="@string/login_with_google" />
+                android:text="@string/auth_login_with_google" />
 
             <TextView
                 android:id="@+id/no_account"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 352ff14..df8b079 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -60,7 +60,7 @@
             android:id="@+id/createTaskButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/create_new_task"
+            android:text="@string/create_task"
             android:layout_margin="8dp"
             android:layout_gravity="center_horizontal"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index 355d7a9..1296335 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -28,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="16dp"
-                android:text="@string/sign_up_to_bluetask"
+                android:text="@string/auth_signup_page_title"
                 android:textColor="?attr/colorPrimary"
                 android:textSize="24sp"
                 android:textStyle="bold" />
@@ -79,7 +79,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="16dp"
                 android:background="@drawable/button_primary"
-                android:text="@string/sign_up_with_google" />
+                android:text="@string/auth_signup_with_google" />
 
             <TextView
                 android:id="@+id/already_account"
@@ -88,7 +88,7 @@
                 android:layout_gravity="center_horizontal"
                 android:clickable="true"
                 android:minHeight="48dp"
-                android:text="@string/ask_already_login"
+                android:text="@string/ask_has_account"
                 android:gravity="center_vertical" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_unlogged.xml b/app/src/main/res/layout/activity_unlogged.xml
index 67f74dd..3d4c766 100644
--- a/app/src/main/res/layout/activity_unlogged.xml
+++ b/app/src/main/res/layout/activity_unlogged.xml
@@ -13,7 +13,7 @@
         android:layout_width="150dp"
         android:layout_height="150dp"
         android:layout_marginBottom="16dp"
-        android:contentDescription="@string/icon_of_the_app"
+        android:contentDescription="@string/app_icon_description"
         android:src="@drawable/logo"
         tools:ignore="ImageContrastCheck" />
 
diff --git a/app/src/main/res/layout/activity_update_task.xml b/app/src/main/res/layout/activity_update_task.xml
index 4262d23..2b4f629 100644
--- a/app/src/main/res/layout/activity_update_task.xml
+++ b/app/src/main/res/layout/activity_update_task.xml
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/spinnerPriority"
         android:layout_marginTop="8dp"
-        android:text="@string/selected_labels"
+        android:text="@string/labels_selected"
         android:minHeight="48dp"
         android:background="?android:attr/selectableItemBackground" />
 
@@ -76,7 +76,7 @@
         android:id="@+id/buttonColorPicker"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/add_color"
+        android:text="@string/pick_color"
         android:layout_below="@id/buttonEndDatePicker" />
 
     <!-- Bottom Bar -->
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index 2e85fa9..103f272 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -21,7 +21,7 @@
         android:title="@string/edit_labels" />
 
     <item
-        android:title="@string/menu_bottom_section">
+        android:title="@string/other">
         <menu>
             <item
                 android:id="@+id/logout"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 023d293..6227afe 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,58 +1,61 @@
 <resources>
-    <string name="icon_of_the_app">Icone de l\'applicaiton</string>
-    <string name="login">Se connecter</string>
-    <string name="get_started">S\'inscrire</string>
-    <string name="password">Mot de passe</string>
-    <string name="confirm_password">Confirmation du mot de passe</string>
-    <string name="sign_up">S\'inscrire</string>
-    <string name="sign_up_with_google">S\'inscrire avec google</string>
-    <string name="ask_already_login">Vous avez déjà un compte ? Connectez-vous !</string>
-    <string name="sign_up_to_bluetask">S\'inscrire sur BlueTask</string>
-    <string name="login_with_google">Se connecter avec Google</string>
-    <string name="login_to_bluetask">Se connecter à BlueTask</string>
-    <string name="ask_no_account">Vous n\'avez pas de compte ? Inscrivez-vous !</string>
-    <string name="create_new_task">Créer une nouvelle tâche</string>
-    <string name="add_task">Créer la tâche</string>
-    <string name="title">Titre</string>
-    <string name="add_color">Couleur de fond</string>
-    <string name="pick_start_date">Date de début</string>
-    <string name="pick_end_date">Date de fin</string>
-    <string name="archive">Archiver</string>
-    <string name="update">Mettre à jour</string>
-    <string name="delete">Supprimer</string>
     <string-array name="priorities">
         <item>Pas de priorité</item>
         <item>Haute</item>
         <item>Moyenne</item>
         <item>Basse</item>
     </string-array>
-    <string name="update_successful">Tâche mise à jour</string>
-    <string name="update_error">Erreur lors de la mise à jour</string>
-    <string name="delete_successful">Tâche supprimé</string>
-    <string name="trash_successful">Tâche supprimé</string>
-    <string name="archive_successful">Tâche archivé</string>
-    <string name="unarchive_successful">Tâche desarchivé</string>
-    <string name="restore">Restaurer</string>
-    <string name="unarchive">Desarchiver</string>
-    <string name="filters">Filtres</string>
-    <string name="orderBy">Trier par</string>
-    <string name="newest">Le plus récent</string>
-    <string name="startDate">Date de début</string>
+    <string name="auth_login_with_google">Se connecter avec Google</string>
+    <string name="auth_login_page_title">Se connecter sur BlueTask</string>
+    <string name="auth_signup_with_google">S\'inscrire avec Google</string>
+    <string name="auth_signup_page_title">S\'inscrire sur BlueTask</string>
+    <string name="ask_has_account">Tu n\'as pas de compte ? Inscris toi !</string>
+    <string name="ask_no_account">Tu as déjà un compte ? Connecte toi !</string>
+    <string name="about_us">A propos</string>
+    <string name="all">Tout</string>
+    <string name="archive">Archive</string>
+    <string name="confirm_password">Confirmation du mot de passe</string>
+    <string name="delete">Supprimer</string>
+    <string name="edit_labels">Editer ls libellés</string>
     <string name="endDate">Date de fin</string>
-    <string name="priority">Priorité</string>
-    <string name="low">Basse</string>
-    <string name="medium">Moyenne</string>
+    <string name="filters">Filtres</string>
+    <string name="get_started">Commencer</string>
     <string name="high">Haute</string>
-    <string name="all">Toutes</string>
-    <string name="apply_filters">Appliquer les filtres</string>
-    <string name="all_tasks">Toutes les tâches</string>
-    <string name="trash">Corbeille</string>
     <string name="labels">Libellés</string>
+    <string name="login">Se connecter</string>
     <string name="logout">Se déconnecter</string>
-    <string name="about_us">A propos</string>
-    <string name="edit_labels">Modifier les libellés</string>
-    <string name="menu_bottom_section">Autres</string>
-    <string name="empty_task_description">Cette tâche n\'a pas de titre ni de description. Pour voir les taches contenant que des listes, aller directement sur la verison web de BlueTask</string>
-    <string name="enter_label">Libellé</string>
-    <string name="add_label">Créer</string>
+    <string name="low">Basse</string>
+    <string name="medium">Moyenne</string>
+    <string name="newest">Plus récente</string>
+    <string name="orderBy">Trier par</string>
+    <string name="other">Autres</string>
+    <string name="password">Mot de passe</string>
+    <string name="priority">Priorité</string>
+    <string name="restore">Restaurer</string>
+    <string name="sign_up">S\'inscrire</string>
+    <string name="startDate">Date de début</string>
+    <string name="title">Titre</string>
+    <string name="trash">Corbeille</string>
+    <string name="unarchive">Désarchiver</string>
+    <string name="update">Mettre à jour</string>
+    <string name="all_tasks">Toutes les tâches</string>
+    <string name="add_label">Ajouter un libellé</string>
+    <string name="add_task">Créer</string>
+    <string name="apply_filters">Appliquer</string>
+    <string name="create_task">Créer une nouvelle tâche</string>
+    <string name="empty_title_description">Cette tâche n\'a ni titre ni description. Pour voir les tâches contenant uniquement des listes, accédez à la version Web de BlueTask.</string>
+    <string name="enter_label">Nom du libellé</string>
+    <string name="labels_selected">Libellés</string>
+    <string name="pick_color">Sélectionner un fond</string>
+    <string name="pick_end_date">Sélectionner une date de début</string>
+    <string name="pick_start_date">Sélectionner une date de fin</string>
+    <string name="select_labels">Sélectionner des libellés</string>
+    <string name="error_auth_failed">Erreur d\'authentification</string>
+    <string name="error_create_task">Erreur de création</string>
+    <string name="error_email_required">L\'email est requis</string>
+    <string name="error_empty_title">Le titre est requis</string>
+    <string name="error_password_required">Le mot de passe est requis</string>
+    <string name="error_password_mismatch">Les mots de passes ne correspondent pas</string>
+    <string name="error_update">Erreur de modification</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ef5bf1c..04f5f4c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,64 +1,75 @@
 <resources>
+    <!-- App Level Strings -->
     <string name="app_name" translatable="false">BlueTask</string>
-    <string name="icon_of_the_app">Icon of the app</string>
-    <string name="login">Login</string>
-    <string name="get_started">Get Started</string>
+    <string name="app_icon_description" translatable="false">App icon</string>
+
+    <!-- Authentication -->
+    <string name="auth_login_with_google">Login with Google</string>
+    <string name="auth_login_page_title">Login to BlueTask</string>
+    <string name="auth_signup_with_google">Sign up with Google</string>
+    <string name="auth_signup_page_title">Sign up to BlueTask</string>
+    <string name="ask_has_account">You have already an account? Login now</string>
+    <string name="ask_no_account">You don\'t have an account ? Sign up now</string>
+
+    <!-- Simple Words -->
+    <string name="about_us">About us</string>
+    <string name="all">All</string>
+    <string name="archive">Archive</string>
+    <string name="confirm_password">Confirm Password</string>
+    <string name="delete">Delete</string>
+    <string name="edit_labels">Edit labels</string>
+    <string name="endDate">End date</string>
+    <string name="description" translatable="false">Description</string>
     <string name="email" translatable="false">Email</string>
+    <string name="filters">Filters</string>
+    <string name="get_started">Get Started</string>
+    <string name="high">High</string>
+    <string name="labels">Labels</string>
+    <string name="login">Login</string>
+    <string name="logout">Logout</string>
+    <string name="low">Low</string>
+    <string name="medium">Medium</string>
+    <string name="menu" translatable="false">Menu</string>
+    <string name="newest">Newest</string>
+    <string name="orderBy">Order by</string>
+    <string name="other">Others</string>
     <string name="password">Password</string>
-    <string name="confirm_password">Confirm Password</string>
+    <string name="priority">Priority</string>
+    <string name="restore">Restore</string>
     <string name="sign_up">Sign up</string>
-    <string name="sign_up_with_google">Sign up with Google</string>
-    <string name="ask_already_login">You have already an account? Login now</string>
-    <string name="sign_up_to_bluetask">Sign up to BlueTask</string>
-    <string name="login_with_google">Login with Google</string>
-    <string name="login_to_bluetask">Login to BlueTask</string>
-    <string name="ask_no_account">You don\'t have an account ? Sign up now</string>
-    <string name="create_new_task">Create new task</string>
-    <string name="add_task">Add Task</string>
-    <string name="description" translatable="false">Description</string>
+    <string name="startDate">Start date</string>
     <string name="title">Title</string>
-    <string name="add_color">Background color</string>
-    <string name="pick_start_date">Pick Start Date</string>
-    <string name="pick_end_date">Pick End Date</string>
-    <string name="archive">Archive</string>
+    <string name="trash">Trash</string>
+    <string name="unarchive">Unarchive</string>
     <string name="update">Update</string>
-    <string name="delete">Delete</string>
+
+    <!-- Task -->
+    <string name="all_tasks">All tasks</string>
+    <string name="add_label">Add Label</string>
+    <string name="add_task">Add Task</string>
+    <string name="apply_filters">Apply Filters</string>
+    <string name="create_task">Create a new task</string>
+    <string name="empty_title_description">This task has no title or description. To see tasks that contain only lists, go directly to the web version of BlueTask.</string>
+    <string name="enter_label">Enter label</string>
+    <string name="labels_selected">Labels selected</string>
+    <string name="pick_color">Pick a background color</string>
+    <string name="pick_end_date">Pick a end Date</string>
+    <string name="pick_start_date">Pick a start date</string>
+    <string name="select_labels">Select labels</string>
+
+    <!-- Error Messages -->
+    <string name="error_auth_failed">Authentication failed</string>
+    <string name="error_create_task">Error creating task</string>
+    <string name="error_email_required">Email is required</string>
+    <string name="error_empty_title">Title is required</string>
+    <string name="error_password_required">Password is required</string>
+    <string name="error_password_mismatch">Passwords do not match</string>
+    <string name="error_update">Error updating task</string>
+
     <string-array name="priorities">
         <item>No Priority</item>
         <item>High</item>
         <item>Medium</item>
         <item>Low</item>
     </string-array>
-    <string name="update_successful">Task updated successfully</string>
-    <string name="update_error">Error updating task</string>
-    <string name="delete_successful">Task deleted successfully</string>
-    <string name="trash_successful">Task moved to trash</string>
-    <string name="archive_successful">Task archived successfully</string>
-    <string name="unarchive_successful">Task unarchived successfully</string>
-    <string name="restore">Restore</string>
-    <string name="unarchive">Unarchive</string>
-    <string name="filters">Filters</string>
-    <string name="orderBy">Order by</string>
-    <string name="newest">Newest</string>
-    <string name="startDate">Start date</string>
-    <string name="endDate">End date</string>
-    <string name="priority">Priority</string>
-    <string name="low">Low</string>
-    <string name="medium">Medium</string>
-    <string name="high">High</string>
-    <string name="all">All</string>
-    <string name="apply_filters">Apply Filters</string>
-    <string name="menu" translatable="false">Menu</string>
-    <string name="all_tasks">All tasks</string>
-    <string name="trash">Trash</string>
-    <string name="labels">Labels</string>
-    <string name="logout">Logout</string>
-    <string name="about_us">About us</string>
-    <string name="edit_labels">Edit labels</string>
-    <string name="menu_bottom_section">Other</string>
-    <string name="empty_task_description">This task has no title or description. To see tasks that contain only lists, go directly to the web version of BlueTask.</string>
-    <string name="enter_label">Enter label</string>
-    <string name="add_label">Add Label</string>
-    <string name="selected_labels">Selected labels</string>
-    <string name="select_labels">Select labels</string>
 </resources>
\ No newline at end of file