Merge pull request #42 from rkheftan/fix/profile-bugs

Fix/profile bugs

public/locales/en/authentication.json

@@ -2,7 +2,7 @@
   "loginForm": {
     "title": "Login/Register",
     "description": "Please enter your email/password to start",
-    "emailOrPhoneLabel": "Email/Password",
+    "emailOrPhoneLabel": "Email/Phone number",
     "submitButton": "Login/Register",
     "loginWithGoogle": "Login with google",
     "emailIsInvalid": "Email is invalid",
@@ -23,6 +23,7 @@
     "moreMinute": "minute",
     "resendCode": "Resend code",
     "confirmAndLogin": "Confirm & login",
+    "confirmAndContinue": "Confirm & continue",
     "loginWithPassword": "Login with password"
   },
   "completeSignUp": {

public/locales/en/setting.json

@@ -102,8 +102,7 @@
     "dark": "Dark",
     "language": "زبان/language",
     "calendar": "Calendar and date format",
-    "solar": "Solar",
-    "lunar": "Lunar",
+    "jalali": "jalali",
     "christian": "Christian",
     "iran": "Iran",
     "saving": "Saving...",