Merge branch 'develop' into fix/completion-page

public/locales/en/common.json

@@ -3,6 +3,7 @@
     "search": "search"
   },
   "messages": {
+    "pageNotFound": "Page not found",
     "noResualtFound": "No result found.",
     "serverError": "Internal server error",
     "networkError": "Network error. Please check your internet connection and try again."

public/locales/en/setting.json

@@ -16,7 +16,7 @@
     "familyName": "Family Name",
     "country": "Country",
     "gender": "Gender",
-    "nationalCode": "National code",
+    "nationalCode": "National code(Op",
     "man": "Male",
     "woman": "Female",
     "genderPlaceholder": "Male",
@@ -62,7 +62,14 @@
     "emailIsInvalid": "Email is invalid",
     "changeEmailFailed": "Change of email failed",
     "anErrorOccurred": "An error occurred.",
-    "saving": "Saving..."
+    "saving": "Saving...",
+    "successSaveProfile": "Profile saved successfully",
+    "errorSave": "Saving failed",
+    "codeSentSuccessfully": "Code sent successfully",
+    "errorSendCode": "Failed to send code",
+    "phoneVerified": "Phone number verified",
+    "errorConfirmCode": "Failed to confirm code",
+    "errorChangePhone": "Failed to change phone number"
   },
 
   "active": {
@@ -76,7 +83,9 @@
     "notLoggedIn": "You are not logged in",
     "failFetchActiveSessions": "Failed to fetch active sessions.",
     "errorFetch": "An error occurred while fetching your active sessions.",
-    "deleting": "Deleting..."
+    "deleting": "Deleting...",
+    "successDelete": "Deleted successfully",
+    "deleteFailed": "Deletion failed"
   },
 
   "settings": {
@@ -123,6 +132,9 @@
     "currentDevice": "Current device",
     "changePassword": "Change password",
     "currentPassword": "Current password",
-    "forgetPassword": "Forgot your password?"
+    "forgetPassword": "Forgot your password?",
+    "passwordChanged": "Password changed",
+    "passwordAdded": "Password added",
+    "error": "Password change failed"
   }
 }