Refactored code, many fixes and improvements in chat backend+frontend

24 files changed, 829 insertions, 829 deletions

diff --git a/main/app/sprinkles/account/locale/ar/messages.php b/main/app/sprinkles/account/locale/ar/messages.php
index 7203904..7f4506d 100644
--- a/main/app/sprinkles/account/locale/ar/messages.php
+++ b/main/app/sprinkles/account/locale/ar/messages.php
@@ -24,21 +24,21 @@ return [
         "INVALID" => "هذا الحساب غير موجود قد تم حذفه يمكنك الاتصا بنا للحصول على مزيد من المعلومات",
 
         "MASTER_NOT_EXISTS" => "لا يمكنك تسجيل حساب جديد حتى تم إنشاء الحساب الرئيسي",
-        "MY"                => "حسابي",
+        "MY" => "حسابي",
 
         "SESSION_COMPROMISED" => [
-            "@TRANSLATION"  => "تم اختراق جلسنك يجب عليك الخروج على كافة الأجهزة، ثم تسجيل الدخول مرة أخرى والتأكد من أن المعلومات الخاصة بك لم يعبث بها",
-            "TITLE"         => "من الممكن أن حسابك قد اخترق",
-            "TEXT"          => "ربما استخدم شخص معلومات التسجيل الدخول للدخول إلى هذه الصفحة. لسلامتك، تم انتهاء جميع الجلسات يرجا <a href=\"{{url}}\">التسجيل مرة اخرى</a> وتحقق من حسابك بسبب النشاط الغريب  قد ترغب في تغيير كلمة المرور"
-         ],
+            "@TRANSLATION" => "تم اختراق جلسنك يجب عليك الخروج على كافة الأجهزة، ثم تسجيل الدخول مرة أخرى والتأكد من أن المعلومات الخاصة بك لم يعبث بها",
+            "TITLE" => "من الممكن أن حسابك قد اخترق",
+            "TEXT" => "ربما استخدم شخص معلومات التسجيل الدخول للدخول إلى هذه الصفحة. لسلامتك، تم انتهاء جميع الجلسات يرجا <a href=\"{{url}}\">التسجيل مرة اخرى</a> وتحقق من حسابك بسبب النشاط الغريب  قد ترغب في تغيير كلمة المرور"
+        ],
 
-        "SESSION_EXPIRED"       => "انتهت جلستك تستطيع تسجيل الدخول مرة أخرى",
+        "SESSION_EXPIRED" => "انتهت جلستك تستطيع تسجيل الدخول مرة أخرى",
 
         "SETTINGS" => [
-            "@TRANSLATION"  => "إعدادات الحساب",
-            "DESCRIPTION"   => "غير إعدادات حسابك، بما في ذلك البريد الإلكتروني، واسم وكلمة المرور
+            "@TRANSLATION" => "إعدادات الحساب",
+            "DESCRIPTION" => "غير إعدادات حسابك، بما في ذلك البريد الإلكتروني، واسم وكلمة المرور
 ",
-            "UPDATED"       => "تم تجديد إعدادات الحساب"
+            "UPDATED" => "تم تجديد إعدادات الحساب"
         ],
 
         "TOOLS" => "أدوات الحساب",
@@ -46,19 +46,19 @@ return [
         "UNVERIFIED" => "لم يتم التحقق من حسابك بعد افحص في رسائل البريد الإلكتروني و ملف البريد المزعج للحصول على تعليمات تفعيل الحساب",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"     => "لقد أرسلنا رابط جديدا لتحقق عبر البريد الإلكتروني إلى {{email}} افحص في رسائل البريد الإلكتروني و ملف البريد المزعج",
-            "RESEND"            => "إعادة ارسال بريد التحقق",
-            "COMPLETE"          => "لقد تم التحقق من حسابك بنجاح يمكنك الآن تسجيل الدخول",
-            "EMAIL"             => "ادخل عنوان البريد الإلكتروني الذي استخدمته للتسجيل، و سوف نرسل البريد الإلكتروني لتحقق مرة أخرى",
-            "PAGE"              => "إعادة إرسال البريد الإلكتروني التحقق من حسابك الجديد",
-            "SEND"              => "ارسل رابط للتحقق عبر البريد الالكتروني",
-            "TOKEN_NOT_FOUND"   => "رمز التحقق غير موجود أو تم تحقق الحساب من قبل",
+            "NEW_LINK_SENT" => "لقد أرسلنا رابط جديدا لتحقق عبر البريد الإلكتروني إلى {{email}} افحص في رسائل البريد الإلكتروني و ملف البريد المزعج",
+            "RESEND" => "إعادة ارسال بريد التحقق",
+            "COMPLETE" => "لقد تم التحقق من حسابك بنجاح يمكنك الآن تسجيل الدخول",
+            "EMAIL" => "ادخل عنوان البريد الإلكتروني الذي استخدمته للتسجيل، و سوف نرسل البريد الإلكتروني لتحقق مرة أخرى",
+            "PAGE" => "إعادة إرسال البريد الإلكتروني التحقق من حسابك الجديد",
+            "SEND" => "ارسل رابط للتحقق عبر البريد الالكتروني",
+            "TOKEN_NOT_FOUND" => "رمز التحقق غير موجود أو تم تحقق الحساب من قبل",
         ]
     ],
 
     "EMAIL" => [
-        "INVALID"   => "لا يوجد حساب ل <strong>{{email}}</strong>",
-        "IN_USE"    => "البريد الإلكتروني <strong>{{email}}</strong> قيد الاستخدام"
+        "INVALID" => "لا يوجد حساب ل <strong>{{email}}</strong>",
+        "IN_USE" => "البريد الإلكتروني <strong>{{email}}</strong> قيد الاستخدام"
     ],
 
     "FIRST_NAME" => "الاسم الاول",
@@ -72,9 +72,9 @@ return [
     "LOGIN" => [
         "@TRANSLATION" => "تسجيل الدخول",
 
-        "ALREADY_COMPLETE"  => "انت بالفعل داخل",
-        "SOCIAL"            => "أو الدخول مع",
-        "REQUIRED"          => "عذرا، يجب عليك تسجيل الدخول للوصول إلى هذا المكان"
+        "ALREADY_COMPLETE" => "انت بالفعل داخل",
+        "SOCIAL" => "أو الدخول مع",
+        "REQUIRED" => "عذرا، يجب عليك تسجيل الدخول للوصول إلى هذا المكان"
     ],
 
     "LOGOUT" => "تسجيل الخروج",
@@ -83,94 +83,94 @@ return [
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"   => "سجل الدخول إلى حسابك في {{site_name}} أو سجيل للحصول على حساب جديد",
-            "SUBTITLE"      => "التسجيل مجانا أو قم بتسجيل الدخول باستخدام حساب موجود",
-            "TITLE"         => "هيا نبدأ",
+            "DESCRIPTION" => "سجل الدخول إلى حسابك في {{site_name}} أو سجيل للحصول على حساب جديد",
+            "SUBTITLE" => "التسجيل مجانا أو قم بتسجيل الدخول باستخدام حساب موجود",
+            "TITLE" => "هيا نبدأ",
         ]
     ],
 
     "PASSWORD" => [
         "@TRANSLATION" => "كلمه المرور",
 
-        "BETWEEN"   => "ما بين {{min}}-{{max}} حروف",
+        "BETWEEN" => "ما بين {{min}}-{{max}} حروف",
 
-        "CONFIRM"               => "تأكيد كلمة المرور",
-        "CONFIRM_CURRENT"       => "تأكيد كلمه المرور الحالي",
-        "CONFIRM_NEW"           => "تأكيد كلمة المرور الجديدة",
-        "CONFIRM_NEW_EXPLAIN"   => "إعادة إدخال كلمة المرور الجديدة",
-        "CONFIRM_NEW_HELP"      => "لازم إذا كان المطلوب اختيار كلمة مرور جديدة",
-        "CURRENT"               => "كلمة المرور الحالية",
-        "CURRENT_EXPLAIN"       => "يجب عليك تأكيد كلمة المرور الحالية لإجراء التغييرات",
+        "CONFIRM" => "تأكيد كلمة المرور",
+        "CONFIRM_CURRENT" => "تأكيد كلمه المرور الحالي",
+        "CONFIRM_NEW" => "تأكيد كلمة المرور الجديدة",
+        "CONFIRM_NEW_EXPLAIN" => "إعادة إدخال كلمة المرور الجديدة",
+        "CONFIRM_NEW_HELP" => "لازم إذا كان المطلوب اختيار كلمة مرور جديدة",
+        "CURRENT" => "كلمة المرور الحالية",
+        "CURRENT_EXPLAIN" => "يجب عليك تأكيد كلمة المرور الحالية لإجراء التغييرات",
 
         "FORGOTTEN" => "كلمه المرور منسية",
         "FORGET" => [
             "@TRANSLATION" => "لقد نسيت كلمة المرور",
 
-            "COULD_NOT_UPDATE"  => "لا يمكن تحديث كلمة المرور",
-            "EMAIL"             => "ادخل عنوان البريد الإلكتروني الذي استخدمته للتسجيل وسوف نرسل تعليمات لإعادة تعيين كلمة المرور",
-            "EMAIL_SEND"        => "أرسل رابط تعيين كلمة المرور عبر البريد الالكتروني",
-            "INVALID"           => "لم يتم العثور على إعادة تعيين كلمة المرور، أو انتهت صلاحية رابط حاول <a href=\"{{url}}\">إعادة تقديم طلبك<a>",
-            "PAGE"              => "الحصول على رابط لإعادة تعيين كلمة المرور",
-            "REQUEST_CANNED"    => "إلغاء طلب كلمة المرور",
-            "REQUEST_SENT"      => "إذا تطابق البريد الإلكتروني <strong>{{email}}</strong> حسابا في نظامنا، فسيتم إرسال رابط إعادة تعيين كلمة المرور إلى <strong>{{email}}</strong>."
+            "COULD_NOT_UPDATE" => "لا يمكن تحديث كلمة المرور",
+            "EMAIL" => "ادخل عنوان البريد الإلكتروني الذي استخدمته للتسجيل وسوف نرسل تعليمات لإعادة تعيين كلمة المرور",
+            "EMAIL_SEND" => "أرسل رابط تعيين كلمة المرور عبر البريد الالكتروني",
+            "INVALID" => "لم يتم العثور على إعادة تعيين كلمة المرور، أو انتهت صلاحية رابط حاول <a href=\"{{url}}\">إعادة تقديم طلبك<a>",
+            "PAGE" => "الحصول على رابط لإعادة تعيين كلمة المرور",
+            "REQUEST_CANNED" => "إلغاء طلب كلمة المرور",
+            "REQUEST_SENT" => "إذا تطابق البريد الإلكتروني <strong>{{email}}</strong> حسابا في نظامنا، فسيتم إرسال رابط إعادة تعيين كلمة المرور إلى <strong>{{email}}</strong>."
         ],
 
         "RESET" => [
-            "@TRANSLATION"      => "إعادة تعيين كلمة المرور",
-            "CHOOSE"            => "اختيار كلمة مرور جديدة للتواصل",
-            "PAGE"              => "اختيار كلمة مرور جديدة لحسابك",
-            "SEND"              => "تعيين كلمة المرور الجديدة وتسجيل الدخول"
+            "@TRANSLATION" => "إعادة تعيين كلمة المرور",
+            "CHOOSE" => "اختيار كلمة مرور جديدة للتواصل",
+            "PAGE" => "اختيار كلمة مرور جديدة لحسابك",
+            "SEND" => "تعيين كلمة المرور الجديدة وتسجيل الدخول"
         ],
 
-        "HASH_FAILED"       => "فشلت التجزئة كلمة المرور يرجى الاتصال بمسؤول الموقع",
-        "INVALID"           => "كلمة مرور الحالية لا تتطابق مع ما لدينا",
-        "NEW"               => "كلمة مرور الجديدة",
+        "HASH_FAILED" => "فشلت التجزئة كلمة المرور يرجى الاتصال بمسؤول الموقع",
+        "INVALID" => "كلمة مرور الحالية لا تتطابق مع ما لدينا",
+        "NEW" => "كلمة مرور الجديدة",
         "NOTHING_TO_UPDATE" => "لا يمكنك تحديث مع نفس كلمة مرور",
-        "UPDATED"           => "جدد كلمة مرور",
-        
+        "UPDATED" => "جدد كلمة مرور",
+
         "CREATE" => [
-            "@TRANSLATION"  => "إنشاء كلمة مرور",
-            "PAGE"          => "اختر كلمة مرور لحسابك الجديد",
-            "SET"           => "تعيين كلمة المرور وتسجيل الدخول"
+            "@TRANSLATION" => "إنشاء كلمة مرور",
+            "PAGE" => "اختر كلمة مرور لحسابك الجديد",
+            "SET" => "تعيين كلمة المرور وتسجيل الدخول"
         ]
     ],
 
-    "REGISTER"      => "تسجيل",
-    "REGISTER_ME"   => "سجلني",
-    "SIGN_IN_HERE"  => "هل لديك حساب؟ <a href=\"{{url}}\">تسجيل الدخول هنا</a>",
+    "REGISTER" => "تسجيل",
+    "REGISTER_ME" => "سجلني",
+    "SIGN_IN_HERE" => "هل لديك حساب؟ <a href=\"{{url}}\">تسجيل الدخول هنا</a>",
 
     "REGISTRATION" => [
-        "BROKEN"            => "نحن آسفون، هناك مشكلة مع عملية تسجيل الحساب يرجى الاتصال بنا مباشرة للحصول على المساعدة",
-        "COMPLETE_TYPE1"    => "لقد سجلت بنجاح يمكنك الآن تسجيل الدخول",
-        "COMPLETE_TYPE2"    => "لقد سجلت بنجاح سوف تتلقى قريبا رسالة التحقق تحتوي على رابط لتفعيل حسابك لن تكون قادرا على تسجيل الدخول حتى الانتهاء من هذه الخطوة",
-        "DISABLED"          => "عذرا، لقد تم تعطيل تسجيل اي حساب",
-        "LOGOUT"            => "لا يمكنك التسجيل للحصول على حساب أثناء تسجيل الدخول",
-        "WELCOME"           => "التسجيل سريع وبسيط"
+        "BROKEN" => "نحن آسفون، هناك مشكلة مع عملية تسجيل الحساب يرجى الاتصال بنا مباشرة للحصول على المساعدة",
+        "COMPLETE_TYPE1" => "لقد سجلت بنجاح يمكنك الآن تسجيل الدخول",
+        "COMPLETE_TYPE2" => "لقد سجلت بنجاح سوف تتلقى قريبا رسالة التحقق تحتوي على رابط لتفعيل حسابك لن تكون قادرا على تسجيل الدخول حتى الانتهاء من هذه الخطوة",
+        "DISABLED" => "عذرا، لقد تم تعطيل تسجيل اي حساب",
+        "LOGOUT" => "لا يمكنك التسجيل للحصول على حساب أثناء تسجيل الدخول",
+        "WELCOME" => "التسجيل سريع وبسيط"
     ],
 
-    "RATE_LIMIT_EXCEEDED"       => "تم تجاوز الحد عددا لهذا الإجراء يجب الانتظار {{delay}} ثواني قبل القيام بمحاولة أخرى",
-    "REMEMBER_ME"               => "تذكرنى",
-    "REMEMBER_ME_ON_COMPUTER"   => "تذكرني على هذا الحاسوب (غير مستحسن للحواسب العامة)",
+    "RATE_LIMIT_EXCEEDED" => "تم تجاوز الحد عددا لهذا الإجراء يجب الانتظار {{delay}} ثواني قبل القيام بمحاولة أخرى",
+    "REMEMBER_ME" => "تذكرنى",
+    "REMEMBER_ME_ON_COMPUTER" => "تذكرني على هذا الحاسوب (غير مستحسن للحواسب العامة)",
 
-    "SIGNIN"                => "تسجيل الدخول",
-    "SIGNIN_OR_REGISTER"    => "تسجيل الدخول أو التسجيل",
-    "SIGNUP"                => "تسجيل",
+    "SIGNIN" => "تسجيل الدخول",
+    "SIGNIN_OR_REGISTER" => "تسجيل الدخول أو التسجيل",
+    "SIGNUP" => "تسجيل",
 
-    "TOS"           => "الأحكام والشروط",
+    "TOS" => "الأحكام والشروط",
     "TOS_AGREEMENT" => "من خلال تسجيل حساب جديد في {{site_title}}, انت تقبل <a {{link_attributes | raw}}>الأحكام والشروط</a>",
-    "TOS_FOR"       => "الأحكام والشروط ل {{title}}",
+    "TOS_FOR" => "الأحكام والشروط ل {{title}}",
 
     "USERNAME" => [
         "@TRANSLATION" => "اسم المستخدم",
 
-        "CHOOSE"  => "اختيار اسم مستخدم فريد",
+        "CHOOSE" => "اختيار اسم مستخدم فريد",
         "INVALID" => "اسم المستخدم غير صالح",
-        "IN_USE"  => "اسم المستخدم <strong>{{user_name}}</strong> قيد الاستخدام"
+        "IN_USE" => "اسم المستخدم <strong>{{user_name}}</strong> قيد الاستخدام"
     ],
 
-    "USER_ID_INVALID"       => "عدم وجود هوية المستخدم المطلوب",
+    "USER_ID_INVALID" => "عدم وجود هوية المستخدم المطلوب",
     "USER_OR_EMAIL_INVALID" => "اسم المستخدم أو عنوان البريد الإلكتروني غير صالح",
-    "USER_OR_PASS_INVALID"  => "اسم المستخدم أو كلمة المرور غير صالحة",
+    "USER_OR_PASS_INVALID" => "اسم المستخدم أو كلمة المرور غير صالحة",
 
     "WELCOME" => "مرحبا بعودتك, {{first_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/ar/validate.php b/main/app/sprinkles/account/locale/ar/validate.php
index 0283680..10543d0 100644
--- a/main/app/sprinkles/account/locale/ar/validate.php
+++ b/main/app/sprinkles/account/locale/ar/validate.php
@@ -12,7 +12,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "يجب أن تكون كلمة المرور وكلمة المرور التأكيدية نفس"
     ]
 ];
diff --git a/main/app/sprinkles/account/locale/de_DE/messages.php b/main/app/sprinkles/account/locale/de_DE/messages.php
index b331552..ef3e47e 100644
--- a/main/app/sprinkles/account/locale/de_DE/messages.php
+++ b/main/app/sprinkles/account/locale/de_DE/messages.php
@@ -15,174 +15,174 @@
 
 return [
     "ACCOUNT" => [
-        "@TRANSLATION"                  => "Konto",
+        "@TRANSLATION" => "Konto",
 
-        "ACCESS_DENIED"                 => "Hmm, sieht aus als hätten Sie keine Berechtigung, um dies zu tun.",
+        "ACCESS_DENIED" => "Hmm, sieht aus als hätten Sie keine Berechtigung, um dies zu tun.",
 
-        "DISABLED"                      => "Dieses Konto wurde deaktiviert. Bitte Kontaktieren Sie uns für weitere Informationen.",
+        "DISABLED" => "Dieses Konto wurde deaktiviert. Bitte Kontaktieren Sie uns für weitere Informationen.",
 
-        "EMAIL_UPDATED"                 => "E-Mail-Adresse aktualisiert.",
+        "EMAIL_UPDATED" => "E-Mail-Adresse aktualisiert.",
 
-        "INVALID"                       => "Dieses Konto existiert nicht. Es wurde möglicherweise gelöscht. Bitte kontaktieren Sie uns für weitere Informationen.",
+        "INVALID" => "Dieses Konto existiert nicht. Es wurde möglicherweise gelöscht. Bitte kontaktieren Sie uns für weitere Informationen.",
 
-        "MASTER_NOT_EXISTS"             => "Sie können kein neues Konto anlegen solange kein Root-Konto angelegt wurde!",
-        "MY"                            => "Mein Konto",
+        "MASTER_NOT_EXISTS" => "Sie können kein neues Konto anlegen solange kein Root-Konto angelegt wurde!",
+        "MY" => "Mein Konto",
 
         "SESSION_COMPROMISED" => [
-            "@TRANSLATION"              => "Ihre Sitzung wurde beeinträchtigt. Sie sollten sich auf allen Geräten abmelden, sich dann wieder anmelden und sicherstellen, dass Ihre Daten nicht manipuliert wurden.",
-            "TITLE"                     => "Ihr Konto wurde möglicherweise beeinträchtigt",
-            "TEXT"                      => "Möglicherweise ist es jemandem gelungen, Ihren Zugang zu dieser Seite zu übernehmen. Aus Sicherheitsgründen wurden Sie überall abgemeldet. Bitte <a href=\"{{url}}\">melden Sie sich neu an</a> und untersuchen Sie das Konto nach verdächtigen Aktivitäten. Außerdem sollten Sie Ihr Passwort ändern."
+            "@TRANSLATION" => "Ihre Sitzung wurde beeinträchtigt. Sie sollten sich auf allen Geräten abmelden, sich dann wieder anmelden und sicherstellen, dass Ihre Daten nicht manipuliert wurden.",
+            "TITLE" => "Ihr Konto wurde möglicherweise beeinträchtigt",
+            "TEXT" => "Möglicherweise ist es jemandem gelungen, Ihren Zugang zu dieser Seite zu übernehmen. Aus Sicherheitsgründen wurden Sie überall abgemeldet. Bitte <a href=\"{{url}}\">melden Sie sich neu an</a> und untersuchen Sie das Konto nach verdächtigen Aktivitäten. Außerdem sollten Sie Ihr Passwort ändern."
         ],
-        "SESSION_EXPIRED"               => "Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.",
+        "SESSION_EXPIRED" => "Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.",
 
         "SETTINGS" => [
-            "@TRANSLATION"              => "Kontoeinstellungen",
-            "DESCRIPTION"               => "Aktualisieren Sie Ihre Kontoeinstellungen, einschließlich E-Mail, Name und Passwort.",
-            "UPDATED"                   => "Kontoeinstellungen aktualisiert"
+            "@TRANSLATION" => "Kontoeinstellungen",
+            "DESCRIPTION" => "Aktualisieren Sie Ihre Kontoeinstellungen, einschließlich E-Mail, Name und Passwort.",
+            "UPDATED" => "Kontoeinstellungen aktualisiert"
         ],
 
-        "TOOLS"                         => "Konto-Werkzeuge",
+        "TOOLS" => "Konto-Werkzeuge",
 
-        "UNVERIFIED"                    => "Ihr Konto wurde noch nicht bestätigt. Überprüfen Sie Ihr E-Mails/Spam-Ordner für die Konto-Aktivierungsanleitung.",
+        "UNVERIFIED" => "Ihr Konto wurde noch nicht bestätigt. Überprüfen Sie Ihr E-Mails/Spam-Ordner für die Konto-Aktivierungsanleitung.",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"             => "Wir haben einen neuen Bestätigungslink an {{email}} gesendet. Überprüfen Sie Ihr E-Mail/Spam-Ordner oder versuchen Sie es später noch einmal.",
-            "RESEND"                    => "Bestätigungsmail erneut senden",
-            "COMPLETE"                  => "Sie haben Ihr Konto erfolgreich Verifiziert. Sie können sich jetzt anmelden.",
-            "EMAIL"                     => "Bitte geben Sie die E-Mail-Adresse ein, mit der Sie sich registriert haben, Überprüfen Sie Ihr E-Mails/Spam-Ordner für die Bestätigungs-E-Mail.",
-            "PAGE"                      => "Senden Sie die Bestätigungs-E-Mail erneut für Ihr neues Konto.",
-            "SEND"                      => "Bestätigungslink erneut per E-Mail zusenden",
-            "TOKEN_NOT_FOUND"           => "Verifizierungstoken existiert nicht / Konto wurde bereits verifiziert"
+            "NEW_LINK_SENT" => "Wir haben einen neuen Bestätigungslink an {{email}} gesendet. Überprüfen Sie Ihr E-Mail/Spam-Ordner oder versuchen Sie es später noch einmal.",
+            "RESEND" => "Bestätigungsmail erneut senden",
+            "COMPLETE" => "Sie haben Ihr Konto erfolgreich Verifiziert. Sie können sich jetzt anmelden.",
+            "EMAIL" => "Bitte geben Sie die E-Mail-Adresse ein, mit der Sie sich registriert haben, Überprüfen Sie Ihr E-Mails/Spam-Ordner für die Bestätigungs-E-Mail.",
+            "PAGE" => "Senden Sie die Bestätigungs-E-Mail erneut für Ihr neues Konto.",
+            "SEND" => "Bestätigungslink erneut per E-Mail zusenden",
+            "TOKEN_NOT_FOUND" => "Verifizierungstoken existiert nicht / Konto wurde bereits verifiziert"
         ]
     ],
 
     "EMAIL" => [
-        "INVALID"                       => "Es gibt kein Konto für <strong>{{email}}</strong>.",
-        "IN_USE"                        => "Die E-Mail Adresse <strong>{{email}}</strong> wird bereits verwendet.",
-        "VERIFICATION_REQUIRED"         => "E-Mail (Bestätigung benötigt - Benutzen Sie eine echte E-Mail Adresse!)"
+        "INVALID" => "Es gibt kein Konto für <strong>{{email}}</strong>.",
+        "IN_USE" => "Die E-Mail Adresse <strong>{{email}}</strong> wird bereits verwendet.",
+        "VERIFICATION_REQUIRED" => "E-Mail (Bestätigung benötigt - Benutzen Sie eine echte E-Mail Adresse!)"
     ],
 
-    "EMAIL_OR_USERNAME"                 => "Benutzername oder E-mail Adresse",
+    "EMAIL_OR_USERNAME" => "Benutzername oder E-mail Adresse",
 
-    "FIRST_NAME"                        => "Vorname",
+    "FIRST_NAME" => "Vorname",
 
-    "HEADER_MESSAGE_ROOT"               => "Sie sind als Root-Benutzer angemeldet.",
+    "HEADER_MESSAGE_ROOT" => "Sie sind als Root-Benutzer angemeldet.",
 
-    "LAST_NAME"                         => "Nachname",
+    "LAST_NAME" => "Nachname",
 
     "LOCALE" => [
-        "ACCOUNT"                       => "Die Sprache und das Gebietsschema für Ihr Konto",
-        "INVALID"                       => "<strong>{{locale}}</strong> ist kein gültiges Gebietsschema."
+        "ACCOUNT" => "Die Sprache und das Gebietsschema für Ihr Konto",
+        "INVALID" => "<strong>{{locale}}</strong> ist kein gültiges Gebietsschema."
     ],
 
     "LOGIN" => [
-        "@TRANSLATION"                  => "Anmelden",
-        "ALREADY_COMPLETE"              => "Sie sind bereits eingeloggt!",
-        "SOCIAL"                        => "Oder loggen Sie sich ein mit",
-        "REQUIRED"                      => "Sorry, Sie müssen angemeldet sein. Um auf diese Ressource zugreifen zu können."
+        "@TRANSLATION" => "Anmelden",
+        "ALREADY_COMPLETE" => "Sie sind bereits eingeloggt!",
+        "SOCIAL" => "Oder loggen Sie sich ein mit",
+        "REQUIRED" => "Sorry, Sie müssen angemeldet sein. Um auf diese Ressource zugreifen zu können."
     ],
 
-    "LOGOUT"                            => "Ausloggen",
+    "LOGOUT" => "Ausloggen",
 
-    "NAME"                              => "Name",
+    "NAME" => "Name",
 
-    "NAME_AND_EMAIL"                    => "Name und E-Mail",
+    "NAME_AND_EMAIL" => "Name und E-Mail",
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"               => "Melden Sie sich in Ihr {{site_name}} Konto an oder registrieren Sie sich für ein neues Konto.",
-            "SUBTITLE"                  => "Registrieren Sie sich kostenlos oder melden Sie sich mit einem bestehenden Konto an.",
-            "TITLE"                     => "Lass uns anfangen!"
+            "DESCRIPTION" => "Melden Sie sich in Ihr {{site_name}} Konto an oder registrieren Sie sich für ein neues Konto.",
+            "SUBTITLE" => "Registrieren Sie sich kostenlos oder melden Sie sich mit einem bestehenden Konto an.",
+            "TITLE" => "Lass uns anfangen!"
         ]
     ],
 
     "PASSWORD" => [
-        "@TRANSLATION"                  => "Passwort",
+        "@TRANSLATION" => "Passwort",
 
-        "BETWEEN"                       => "Zwischen {{min}}-{{max}} Zeichen",
+        "BETWEEN" => "Zwischen {{min}}-{{max}} Zeichen",
 
-        "CONFIRM"                       => "Bestätige das Passwort",
-        "CONFIRM_CURRENT"               => "Bitte bestätige dein jetziges Passwort",
-        "CONFIRM_NEW"                   => "Neues Passwort bestätigen",
-        "CONFIRM_NEW_EXPLAIN"           => "Geben Sie Ihr neues Passwort erneut ein",
-        "CONFIRM_NEW_HELP"              => "Erforderlich, wenn Sie ein neues Passwort wählen",
+        "CONFIRM" => "Bestätige das Passwort",
+        "CONFIRM_CURRENT" => "Bitte bestätige dein jetziges Passwort",
+        "CONFIRM_NEW" => "Neues Passwort bestätigen",
+        "CONFIRM_NEW_EXPLAIN" => "Geben Sie Ihr neues Passwort erneut ein",
+        "CONFIRM_NEW_HELP" => "Erforderlich, wenn Sie ein neues Passwort wählen",
         "CREATE" => [
-            "@TRANSLATION"              => "Passwort setzen",
-            "PAGE"                      => "Setzen Sie ein Passwort für den Account.",
-            "SET"                       => "Passwort setzen und anmelden"
+            "@TRANSLATION" => "Passwort setzen",
+            "PAGE" => "Setzen Sie ein Passwort für den Account.",
+            "SET" => "Passwort setzen und anmelden"
         ],
-        "CURRENT"                       => "Aktuelles Passwort",
-        "CURRENT_EXPLAIN"               => "Sie müssen Ihr aktuelles Passwort bestätigen, um Änderungen vorzunehmen",
+        "CURRENT" => "Aktuelles Passwort",
+        "CURRENT_EXPLAIN" => "Sie müssen Ihr aktuelles Passwort bestätigen, um Änderungen vorzunehmen",
 
-        "FORGOTTEN"                     => "Passwort vergessen",
+        "FORGOTTEN" => "Passwort vergessen",
         "FORGET" => [
-            "@TRANSLATION"              => "Ich habe mein Passwort vergessen",
-
-            "COULD_NOT_UPDATE"          => "Das Passwort konnte nicht aktualisiert werden.",
-            "EMAIL"                     => "Bitte geben Sie die E-Mail-Adresse ein, mit der Sie sich registriert haben. Ein Link mit der Anweisungen zum Zurücksetzen Ihres Passworts wird Ihnen per E-Mail zugeschickt.",
-            "EMAIL_SEND"                => "Neue Passwort zurücksetzen E-Mail senden",
-            "INVALID"                   => "Diese Anforderung zum Zurücksetzen des Passworts wurde nicht gefunden oder ist abgelaufen.Bitte versuchen Sie <a href=\'{{url}}\'>Ihre Anfrage erneut einzureichen<a>.",
-            "PAGE"                      => "Holen Sie sich einen Link, um Ihr Passwort zurückzusetzen.",
-            "REQUEST_CANNED"            => "Verlorene Passwortanforderung abgebrochen.",
-            "REQUEST_SENT"              => "Wenn die E-Mail <strong>{{email}}</strong> mit einem Account in unserem System übereinstimmt, wird ein Passwort-Reset-Link an <strong>{{email}}</strong> gesendet."
+            "@TRANSLATION" => "Ich habe mein Passwort vergessen",
+
+            "COULD_NOT_UPDATE" => "Das Passwort konnte nicht aktualisiert werden.",
+            "EMAIL" => "Bitte geben Sie die E-Mail-Adresse ein, mit der Sie sich registriert haben. Ein Link mit der Anweisungen zum Zurücksetzen Ihres Passworts wird Ihnen per E-Mail zugeschickt.",
+            "EMAIL_SEND" => "Neue Passwort zurücksetzen E-Mail senden",
+            "INVALID" => "Diese Anforderung zum Zurücksetzen des Passworts wurde nicht gefunden oder ist abgelaufen.Bitte versuchen Sie <a href=\'{{url}}\'>Ihre Anfrage erneut einzureichen<a>.",
+            "PAGE" => "Holen Sie sich einen Link, um Ihr Passwort zurückzusetzen.",
+            "REQUEST_CANNED" => "Verlorene Passwortanforderung abgebrochen.",
+            "REQUEST_SENT" => "Wenn die E-Mail <strong>{{email}}</strong> mit einem Account in unserem System übereinstimmt, wird ein Passwort-Reset-Link an <strong>{{email}}</strong> gesendet."
         ],
 
-        "HASH_FAILED"                   => "Passwort Hashing fehlgeschlagen. Bitte kontaktieren Sie einen Administrator.",
-        "INVALID"                       => "Das aktuelle Passwort stimmt nicht mit dem Datensatz überein",
-        "NEW"                           => "Neues Passwort",
-        "NOTHING_TO_UPDATE"             => "Sie können nicht das gleiche Passwort zum Aktualisieren verwenden",
+        "HASH_FAILED" => "Passwort Hashing fehlgeschlagen. Bitte kontaktieren Sie einen Administrator.",
+        "INVALID" => "Das aktuelle Passwort stimmt nicht mit dem Datensatz überein",
+        "NEW" => "Neues Passwort",
+        "NOTHING_TO_UPDATE" => "Sie können nicht das gleiche Passwort zum Aktualisieren verwenden",
 
         "RESET" => [
-            "@TRANSLATION"              => "Passwort zurücksetzen",
-            "CHOOSE"                    => "Bitte wählen Sie ein neues Passwort, um fortzufahren.",
-            "PAGE"                      => "Wählen Sie ein neues Passwort für Ihr Konto.",
-            "SEND"                      => "Neues Passwort festlegen und anmelden"
+            "@TRANSLATION" => "Passwort zurücksetzen",
+            "CHOOSE" => "Bitte wählen Sie ein neues Passwort, um fortzufahren.",
+            "PAGE" => "Wählen Sie ein neues Passwort für Ihr Konto.",
+            "SEND" => "Neues Passwort festlegen und anmelden"
         ],
 
-        "UPDATED"                       => "Konto Passwort aktualisiert"
+        "UPDATED" => "Konto Passwort aktualisiert"
     ],
 
     "PROFILE" => [
-        "SETTINGS"                      => "Profileinstellungen",
-        "UPDATED"                       => "Profileinstellungen aktualisiert"
+        "SETTINGS" => "Profileinstellungen",
+        "UPDATED" => "Profileinstellungen aktualisiert"
     ],
 
-    "RATE_LIMIT_EXCEEDED"               => "Die grenze für diese Maßnahme wurde überschritten. Sie müssen weitere {{delay}} Sekunden warten, bevor Sie einen weiteren Versuch machen dürfen.",
+    "RATE_LIMIT_EXCEEDED" => "Die grenze für diese Maßnahme wurde überschritten. Sie müssen weitere {{delay}} Sekunden warten, bevor Sie einen weiteren Versuch machen dürfen.",
 
-    "REGISTER"                          => "Registrieren",
-    "REGISTER_ME"                       => "Melden Sie mich an",
+    "REGISTER" => "Registrieren",
+    "REGISTER_ME" => "Melden Sie mich an",
     "REGISTRATION" => [
-        "BROKEN"                        => "Es tut uns leid, es gibt ein Problem mit unserer Registrierung. Bitte kontaktieren Sie uns direkt für Hilfe.",
-        "COMPLETE_TYPE1"                => "Sie haben sich erfolgreich registriert. Sie können sich jetzt anmelden.",
-        "COMPLETE_TYPE2"                => "Sie haben sich erfolgreich registriert. Sie erhalten in Kürze eine Bestätigungs-E-Mail mit einem Link zur Aktivierung Ihres Kontos. Sie können sich nicht anmelden, bis Sie diesen Schritt abgeschlossen haben.",
-        "DISABLED"                      => "Es tut uns leid, Die Registrierung des Kontos ist deaktiviert.",
-        "LOGOUT"                        => "Es tut uns leid, Sie können kein neues Konto registrieren, während Sie angemeldet sind. Bitte melden Sie sich zuerst ab.",
-        "WELCOME"                       => "Die Registrierung ist schnell und einfach."
+        "BROKEN" => "Es tut uns leid, es gibt ein Problem mit unserer Registrierung. Bitte kontaktieren Sie uns direkt für Hilfe.",
+        "COMPLETE_TYPE1" => "Sie haben sich erfolgreich registriert. Sie können sich jetzt anmelden.",
+        "COMPLETE_TYPE2" => "Sie haben sich erfolgreich registriert. Sie erhalten in Kürze eine Bestätigungs-E-Mail mit einem Link zur Aktivierung Ihres Kontos. Sie können sich nicht anmelden, bis Sie diesen Schritt abgeschlossen haben.",
+        "DISABLED" => "Es tut uns leid, Die Registrierung des Kontos ist deaktiviert.",
+        "LOGOUT" => "Es tut uns leid, Sie können kein neues Konto registrieren, während Sie angemeldet sind. Bitte melden Sie sich zuerst ab.",
+        "WELCOME" => "Die Registrierung ist schnell und einfach."
     ],
-    "REMEMBER_ME"                       => "Erinnere dich an mich!",
-    "REMEMBER_ME_ON_COMPUTER"           => "Erinnere dich an mich auf diesem Computer (nicht für öffentliche Computer empfohlen)",
+    "REMEMBER_ME" => "Erinnere dich an mich!",
+    "REMEMBER_ME_ON_COMPUTER" => "Erinnere dich an mich auf diesem Computer (nicht für öffentliche Computer empfohlen)",
 
-    "SIGN_IN_HERE"                      => "Sie haben bereits einen Account? <a href=\"{{url}}\">Melden Sie sich hier an.</a>",
-    "SIGNIN"                            => "Anmelden",
-    "SIGNIN_OR_REGISTER"                => "Anmelden oder registrieren",
-    "SIGNUP"                            => "Anmelden",
+    "SIGN_IN_HERE" => "Sie haben bereits einen Account? <a href=\"{{url}}\">Melden Sie sich hier an.</a>",
+    "SIGNIN" => "Anmelden",
+    "SIGNIN_OR_REGISTER" => "Anmelden oder registrieren",
+    "SIGNUP" => "Anmelden",
 
-    "TOS"                               => "Geschäftsbedingungen",
-    "TOS_AGREEMENT"                     => "Durch die Registrierung eines Kontos auf {{site_title}} akzeptieren Sie die <a {{link_attributes | raw}}> Bedingungen </a>.",
-    "TOS_FOR"                           => "Allgemeine Geschäftsbedingungen für {{title}}",
+    "TOS" => "Geschäftsbedingungen",
+    "TOS_AGREEMENT" => "Durch die Registrierung eines Kontos auf {{site_title}} akzeptieren Sie die <a {{link_attributes | raw}}> Bedingungen </a>.",
+    "TOS_FOR" => "Allgemeine Geschäftsbedingungen für {{title}}",
 
     "USERNAME" => [
-        "@TRANSLATION"                  => "Benutzername",
+        "@TRANSLATION" => "Benutzername",
 
-        "CHOOSE"                        => "Wählen Sie einen eindeutigen Benutzernamen",
-        "INVALID"                       => "Ungültiger Benutzername",
-        "IN_USE"                        => "Benutzername <strong>{{user_name}}</strong> wird bereits verwendet.",
-        "NOT_AVAILABLE"                 => "Benutzername <strong>{{user_name}}</strong> ist nicht verfügbar. Wähle einen anderen Namen, der klicken Sie auf 'vorschlagen'."
+        "CHOOSE" => "Wählen Sie einen eindeutigen Benutzernamen",
+        "INVALID" => "Ungültiger Benutzername",
+        "IN_USE" => "Benutzername <strong>{{user_name}}</strong> wird bereits verwendet.",
+        "NOT_AVAILABLE" => "Benutzername <strong>{{user_name}}</strong> ist nicht verfügbar. Wähle einen anderen Namen, der klicken Sie auf 'vorschlagen'."
     ],
 
-    "USER_ID_INVALID"                   => "Die angeforderte Benutzer-ID existiert nicht.",
-    "USER_OR_EMAIL_INVALID"             => "Benutzername oder E-Mail-Adresse ist ungültig.",
-    "USER_OR_PASS_INVALID"              => "Benutzername oder Passwort ist ungültig.",
+    "USER_ID_INVALID" => "Die angeforderte Benutzer-ID existiert nicht.",
+    "USER_OR_EMAIL_INVALID" => "Benutzername oder E-Mail-Adresse ist ungültig.",
+    "USER_OR_PASS_INVALID" => "Benutzername oder Passwort ist ungültig.",
 
-    "WELCOME"                           => "Willkommen zurück, {{first_name}}"
+    "WELCOME" => "Willkommen zurück, {{first_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/de_DE/validate.php b/main/app/sprinkles/account/locale/de_DE/validate.php
index 30cf98b..ea99fc0 100644
--- a/main/app/sprinkles/account/locale/de_DE/validate.php
+++ b/main/app/sprinkles/account/locale/de_DE/validate.php
@@ -15,7 +15,7 @@
 
 return [
     "VALIDATE" => [
-        "PASSWORD_MISMATCH"             => "Ihr Passwort und das Bestätigungspasswort müssen übereinstimmen.",
-        "USERNAME"                      => "Benutzernamen dürfen nur aus Kleinbuchstaben, Zahlen, '.', '-' und '_' bestehen."
+        "PASSWORD_MISMATCH" => "Ihr Passwort und das Bestätigungspasswort müssen übereinstimmen.",
+        "USERNAME" => "Benutzernamen dürfen nur aus Kleinbuchstaben, Zahlen, '.', '-' und '_' bestehen."
     ]
 ];
diff --git a/main/app/sprinkles/account/locale/en_US/messages.php b/main/app/sprinkles/account/locale/en_US/messages.php
index 17d7582..c57ba62 100644
--- a/main/app/sprinkles/account/locale/en_US/messages.php
+++ b/main/app/sprinkles/account/locale/en_US/messages.php
@@ -10,7 +10,7 @@
  * @package userfrosting\i18n\en_US
  * @author Alexander Weissman
  */
- 
+
 return [
     "ACCOUNT" => [
         "@TRANSLATION" => "Account",
@@ -24,19 +24,19 @@ return [
         "INVALID" => "This account does not exist. It may have been deleted.  Please contact us for more information.",
 
         "MASTER_NOT_EXISTS" => "You cannot register an account until the master account has been created!",
-        "MY"                => "My Account",
+        "MY" => "My Account",
 
         "SESSION_COMPROMISED" => [
-            "@TRANSLATION"  => "Your session has been compromised.  You should log out on all devices, then log back in and make sure that your data has not been tampered with.",
-            "TITLE"         => "Your account may have been compromised",
-            "TEXT"          => "Someone may have used your login information to acccess this page.  For your safety, all sessions were logged out. Please <a href=\"{{url}}\">log in</a> and check your account for suspicious activity.  You may also wish to change your password."
+            "@TRANSLATION" => "Your session has been compromised.  You should log out on all devices, then log back in and make sure that your data has not been tampered with.",
+            "TITLE" => "Your account may have been compromised",
+            "TEXT" => "Someone may have used your login information to acccess this page.  For your safety, all sessions were logged out. Please <a href=\"{{url}}\">log in</a> and check your account for suspicious activity.  You may also wish to change your password."
         ],
-        "SESSION_EXPIRED"       => "Your session has expired.  Please sign in again.",
+        "SESSION_EXPIRED" => "Your session has expired.  Please sign in again.",
 
         "SETTINGS" => [
-            "@TRANSLATION"  => "Account settings",
-            "DESCRIPTION"   => "Update your account settings, including email, name, and password.",
-            "UPDATED"       => "Account settings updated"
+            "@TRANSLATION" => "Account settings",
+            "DESCRIPTION" => "Update your account settings, including email, name, and password.",
+            "UPDATED" => "Account settings updated"
         ],
 
         "TOOLS" => "Account tools",
@@ -44,19 +44,19 @@ return [
         "UNVERIFIED" => "Your account has not yet been verified. Check your emails / spam folder for account activation instructions.",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"     => "We have emailed a new verification link to {{email}}.  Please check your inbox and spam folders for this email.",
-            "RESEND"            => "Resend verification email",
-            "COMPLETE"          => "You have successfully verified your account. You can now login.",
-            "EMAIL"             => "Please enter the email address you used to sign up, and your verification email will be resent.",
-            "PAGE"              => "Resend the verification email for your new account.",
-            "SEND"              => "Email the verification link for my account",
-            "TOKEN_NOT_FOUND"   => "Verification token does not exist / Account is already verified",
+            "NEW_LINK_SENT" => "We have emailed a new verification link to {{email}}.  Please check your inbox and spam folders for this email.",
+            "RESEND" => "Resend verification email",
+            "COMPLETE" => "You have successfully verified your account. You can now login.",
+            "EMAIL" => "Please enter the email address you used to sign up, and your verification email will be resent.",
+            "PAGE" => "Resend the verification email for your new account.",
+            "SEND" => "Email the verification link for my account",
+            "TOKEN_NOT_FOUND" => "Verification token does not exist / Account is already verified",
         ]
     ],
 
     "EMAIL" => [
-        "INVALID"               => "There is no account for <strong>{{email}}</strong>.",
-        "IN_USE"                => "Email <strong>{{email}}</strong> is already in use.",
+        "INVALID" => "There is no account for <strong>{{email}}</strong>.",
+        "IN_USE" => "Email <strong>{{email}}</strong> is already in use.",
         "VERIFICATION_REQUIRED" => "Email (verification required - use a real address!)"
     ],
 
@@ -72,10 +72,10 @@ return [
         "INVALID" => "<strong>{{locale}}</strong> is not a valid locale."
     ],
     "LOGIN" => [
-        "@TRANSLATION"      => "Login",
-        "ALREADY_COMPLETE"  => "You are already logged in!",
-        "SOCIAL"            => "Or login with",
-        "REQUIRED"          => "Sorry, you must be logged in to access this resource."
+        "@TRANSLATION" => "Login",
+        "ALREADY_COMPLETE" => "You are already logged in!",
+        "SOCIAL" => "Or login with",
+        "REQUIRED" => "Sorry, you must be logged in to access this resource."
     ],
     "LOGOUT" => "Logout",
 
@@ -85,99 +85,99 @@ return [
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"   => "Sign in to your {{site_name}} account, or register for a new account.",
-            "SUBTITLE"      => "Register for free, or sign in with an existing account.",
-            "TITLE"         => "Let's get started!",
+            "DESCRIPTION" => "Sign in to your {{site_name}} account, or register for a new account.",
+            "SUBTITLE" => "Register for free, or sign in with an existing account.",
+            "TITLE" => "Let's get started!",
         ]
     ],
 
     "PASSWORD" => [
         "@TRANSLATION" => "Password",
 
-        "BETWEEN"   => "Between {{min}}-{{max}} characters",
+        "BETWEEN" => "Between {{min}}-{{max}} characters",
 
-        "CONFIRM"               => "Confirm password",
-        "CONFIRM_CURRENT"       => "Please confirm your current password",
-        "CONFIRM_NEW"           => "Confirm New Password",
-        "CONFIRM_NEW_EXPLAIN"   => "Re-enter your new password",
-        "CONFIRM_NEW_HELP"      => "Required only if selecting a new password",
+        "CONFIRM" => "Confirm password",
+        "CONFIRM_CURRENT" => "Please confirm your current password",
+        "CONFIRM_NEW" => "Confirm New Password",
+        "CONFIRM_NEW_EXPLAIN" => "Re-enter your new password",
+        "CONFIRM_NEW_HELP" => "Required only if selecting a new password",
         "CREATE" => [
-            "@TRANSLATION"  => "Create Password",
-            "PAGE"          => "Choose a password for your new account.",
-            "SET"           => "Set Password and Sign In"
+            "@TRANSLATION" => "Create Password",
+            "PAGE" => "Choose a password for your new account.",
+            "SET" => "Set Password and Sign In"
         ],
-        "CURRENT"               => "Current Password",
-        "CURRENT_EXPLAIN"       => "You must confirm your current password to make changes",
+        "CURRENT" => "Current Password",
+        "CURRENT_EXPLAIN" => "You must confirm your current password to make changes",
 
         "FORGOTTEN" => "Forgotten Password",
         "FORGET" => [
             "@TRANSLATION" => "I forgot my password",
 
-            "COULD_NOT_UPDATE"  => "Couldn't update password.",
-            "EMAIL"             => "Please enter the email address you used to sign up. A link with instructions to reset your password will be emailed to you.",
-            "EMAIL_SEND"        => "Email Password Reset Link",
-            "INVALID"           => "This password reset request could not be found, or has expired.  Please try <a href=\"{{url}}\">resubmitting your request<a>.",
-            "PAGE"              => "Get a link to reset your password.",
-            "REQUEST_CANNED"    => "Lost password request cancelled.",
-            "REQUEST_SENT"      => "If the email <strong>{{email}}</strong> matches an account in our system, a password reset link will be sent to <strong>{{email}}</strong>."
+            "COULD_NOT_UPDATE" => "Couldn't update password.",
+            "EMAIL" => "Please enter the email address you used to sign up. A link with instructions to reset your password will be emailed to you.",
+            "EMAIL_SEND" => "Email Password Reset Link",
+            "INVALID" => "This password reset request could not be found, or has expired.  Please try <a href=\"{{url}}\">resubmitting your request<a>.",
+            "PAGE" => "Get a link to reset your password.",
+            "REQUEST_CANNED" => "Lost password request cancelled.",
+            "REQUEST_SENT" => "If the email <strong>{{email}}</strong> matches an account in our system, a password reset link will be sent to <strong>{{email}}</strong>."
         ],
 
-        "HASH_FAILED"       => "Password hashing failed. Please contact a site administrator.",
-        "INVALID"           => "Current password doesn't match the one we have on record",
-        "NEW"               => "New Password",
+        "HASH_FAILED" => "Password hashing failed. Please contact a site administrator.",
+        "INVALID" => "Current password doesn't match the one we have on record",
+        "NEW" => "New Password",
         "NOTHING_TO_UPDATE" => "You cannot update with the same password",
 
         "RESET" => [
-            "@TRANSLATION"      => "Reset Password",
-            "CHOOSE"            => "Please choose a new password to continue.",
-            "PAGE"              => "Choose a new password for your account.",
-            "SEND"              => "Set New Password and Sign In"
+            "@TRANSLATION" => "Reset Password",
+            "CHOOSE" => "Please choose a new password to continue.",
+            "PAGE" => "Choose a new password for your account.",
+            "SEND" => "Set New Password and Sign In"
         ],
 
-        "UPDATED"           => "Account password updated"
+        "UPDATED" => "Account password updated"
     ],
 
-    "PROFILE"       => [
-        "SETTINGS"  => "Profile settings",
-        "UPDATED"   => "Profile settings updated"
+    "PROFILE" => [
+        "SETTINGS" => "Profile settings",
+        "UPDATED" => "Profile settings updated"
     ],
 
-    "RATE_LIMIT_EXCEEDED"       => "The rate limit for this action has been exceeded.  You must wait another {{delay}} seconds before you will be allowed to make another attempt.",
+    "RATE_LIMIT_EXCEEDED" => "The rate limit for this action has been exceeded.  You must wait another {{delay}} seconds before you will be allowed to make another attempt.",
 
-    "REGISTER"      => "Register",
-    "REGISTER_ME"   => "Sign me up",
+    "REGISTER" => "Register",
+    "REGISTER_ME" => "Sign me up",
     "REGISTRATION" => [
-        "BROKEN"            => "We're sorry, there is a problem with our account registration process.  Please contact us directly for assistance.",
-        "COMPLETE_TYPE1"    => "You have successfully registered. You can now sign in.",
-        "COMPLETE_TYPE2"    => "You have successfully registered. A link to activate your account has been sent to <strong>{{email}}</strong>.  You will not be able to sign in until you complete this step.",
-        "DISABLED"          => "We're sorry, account registration has been disabled.",
-        "LOGOUT"            => "I'm sorry, you cannot register for an account while logged in. Please log out first.",
-        "WELCOME"           => "Registration is fast and simple."
+        "BROKEN" => "We're sorry, there is a problem with our account registration process.  Please contact us directly for assistance.",
+        "COMPLETE_TYPE1" => "You have successfully registered. You can now sign in.",
+        "COMPLETE_TYPE2" => "You have successfully registered. A link to activate your account has been sent to <strong>{{email}}</strong>.  You will not be able to sign in until you complete this step.",
+        "DISABLED" => "We're sorry, account registration has been disabled.",
+        "LOGOUT" => "I'm sorry, you cannot register for an account while logged in. Please log out first.",
+        "WELCOME" => "Registration is fast and simple."
     ],
-    "REMEMBER_ME"               => "Keep me signed in",
-    "REMEMBER_ME_ON_COMPUTER"   => "Remember me on this computer (not recommended for public computers)",
+    "REMEMBER_ME" => "Keep me signed in",
+    "REMEMBER_ME_ON_COMPUTER" => "Remember me on this computer (not recommended for public computers)",
 
-    "SIGN_IN_HERE"          => "Already have an account? <a href=\"{{url}}\">Sign in here.</a>",
-    "SIGNIN"                => "Sign in",
-    "SIGNIN_OR_REGISTER"    => "Sign in or register",
-    "SIGNUP"                => "Sign Up",
+    "SIGN_IN_HERE" => "Already have an account? <a href=\"{{url}}\">Sign in here.</a>",
+    "SIGNIN" => "Sign in",
+    "SIGNIN_OR_REGISTER" => "Sign in or register",
+    "SIGNUP" => "Sign Up",
 
-    "TOS"           => "Terms and Conditions",
+    "TOS" => "Terms and Conditions",
     "TOS_AGREEMENT" => "By registering an account with {{site_title}}, you accept the <a {{link_attributes | raw}}>terms and conditions</a>.",
-    "TOS_FOR"       => "Terms and Conditions for {{title}}",
+    "TOS_FOR" => "Terms and Conditions for {{title}}",
 
     "USERNAME" => [
         "@TRANSLATION" => "Username",
 
-        "CHOOSE"        => "Choose a unique username",
-        "INVALID"       => "Invalid username",
-        "IN_USE"        => "Username <strong>{{user_name}}</strong> is already in use.",
+        "CHOOSE" => "Choose a unique username",
+        "INVALID" => "Invalid username",
+        "IN_USE" => "Username <strong>{{user_name}}</strong> is already in use.",
         "NOT_AVAILABLE" => "Username <strong>{{user_name}}</strong> is not available. Choose a different name, or click 'suggest'."
     ],
 
-    "USER_ID_INVALID"       => "The requested user id does not exist.",
+    "USER_ID_INVALID" => "The requested user id does not exist.",
     "USER_OR_EMAIL_INVALID" => "Username or email address is invalid.",
-    "USER_OR_PASS_INVALID"  => "User not found or password is invalid.",
+    "USER_OR_PASS_INVALID" => "User not found or password is invalid.",
 
     "WELCOME" => "Welcome back, {{first_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/en_US/validate.php b/main/app/sprinkles/account/locale/en_US/validate.php
index 00c0aef..f91ecfe 100644
--- a/main/app/sprinkles/account/locale/en_US/validate.php
+++ b/main/app/sprinkles/account/locale/en_US/validate.php
@@ -12,7 +12,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "Your password and confirmation password must match.",
         "USERNAME" => "Username may consist only of lowercase letters, numbers, '.', '-', and '_'."
     ]
diff --git a/main/app/sprinkles/account/locale/es_ES/messages.php b/main/app/sprinkles/account/locale/es_ES/messages.php
index aa8b8ed..f469119 100644
--- a/main/app/sprinkles/account/locale/es_ES/messages.php
+++ b/main/app/sprinkles/account/locale/es_ES/messages.php
@@ -27,9 +27,9 @@ return [
         "MY" => "Mi Perfil",
 
         "SESSION_COMPROMISED" => [
-            "@TRANSLATION"  => "Su sesión ha sido comprometida. Debe desconectarse de todos los dispositivos y, a continuación, volver a iniciar sesión y asegurarse de que sus datos no han sido manipulados.",
-            "TITLE"         => "Es posible que su cuenta se haya visto comprometida.",
-            "TEXT"          => "Alguien puede haber utilizado su información de acceso para acceder a esta página. Para su seguridad, todas las sesiones se cerraron. <a href=\"{{url}}\"> ingrese </a> y compruebe si su actividad es sospechosa en su cuenta. También puede cambiar su contraseña."
+            "@TRANSLATION" => "Su sesión ha sido comprometida. Debe desconectarse de todos los dispositivos y, a continuación, volver a iniciar sesión y asegurarse de que sus datos no han sido manipulados.",
+            "TITLE" => "Es posible que su cuenta se haya visto comprometida.",
+            "TEXT" => "Alguien puede haber utilizado su información de acceso para acceder a esta página. Para su seguridad, todas las sesiones se cerraron. <a href=\"{{url}}\"> ingrese </a> y compruebe si su actividad es sospechosa en su cuenta. También puede cambiar su contraseña."
         ],
         "SESSION_EXPIRED" => "Su sesión ha caducado. Inicie sesión nuevamente.",
 
@@ -105,9 +105,9 @@ return [
         "CONFIRM_NEW_EXPLAIN" => "Vuelve a ingresar tu nueva contraseña",
         "CONFIRM_NEW_HELP" => "Sólo se requiere si se selecciona una nueva contraseña",
         "CREATE" => [
-            "@TRANSLATION"  => "Crear contraseña",
-            "PAGE"          => "Elija una contraseña para su nueva cuenta.",
-            "SET"           => "Establecer contraseña e iniciar sesión"
+            "@TRANSLATION" => "Crear contraseña",
+            "PAGE" => "Elija una contraseña para su nueva cuenta.",
+            "SET" => "Establecer contraseña e iniciar sesión"
         ],
         "CURRENT" => "Contraseña actual",
         "CURRENT_EXPLAIN" => "Debe confirmar su contraseña actual para realizar cambios",
@@ -156,7 +156,7 @@ return [
         "LOGOUT" => "Lo siento, no puede registrarse para una cuenta mientras está conectado. Por favor, cierra la sesión primero.",
         "WELCOME" => "El registro es rápido y sencillo."
     ],
-   
+
     "REMEMBER_ME" => "¡Recuérdame!",
     "REMEMBER_ME_ON_COMPUTER" => "Recuérdeme en este ordenador (no se recomienda para ordenadores públicos)",
 
@@ -165,7 +165,7 @@ return [
     "SIGNUP" => "Regístrate",
     "SUGGEST" => "Sugerencia",
     "HAVE_ACCOUNT" => "¿Ya tienes una cuenta?",
-    "SIGN_IN_HERE"=> "¿Ya tienes una cuenta? <a href=\"{{url}}\"> Acceda aquí. </a>",
+    "SIGN_IN_HERE" => "¿Ya tienes una cuenta? <a href=\"{{url}}\"> Acceda aquí. </a>",
 
 
     "TOS" => "Términos y Condiciones",
diff --git a/main/app/sprinkles/account/locale/es_ES/validate.php b/main/app/sprinkles/account/locale/es_ES/validate.php
index c8ea0a4..ecc1b6a 100644
--- a/main/app/sprinkles/account/locale/es_ES/validate.php
+++ b/main/app/sprinkles/account/locale/es_ES/validate.php
@@ -12,7 +12,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "Su contraseña y contraseña de confirmación deben coincidir.",
         "USERNAME" => "El nombre de usuario puede consistir sólo en letras minúsculas, números, '.', '-' y '_'."
     ]
diff --git a/main/app/sprinkles/account/locale/fa/messages.php b/main/app/sprinkles/account/locale/fa/messages.php
index 22623ba..f66727f 100644
--- a/main/app/sprinkles/account/locale/fa/messages.php
+++ b/main/app/sprinkles/account/locale/fa/messages.php
@@ -25,16 +25,16 @@ return [
         "INVALID" => "این اکانت موجود نیست. ممکن است که حذف شده باشد. برای اطلاعات بیشتر، لطفا با ما تماس برقرار کنید.",
 
         "MASTER_NOT_EXISTS" => "تا زمانی که حساب اصلی ساخته نشده است نمیتوانید حساب کاربری جدیدی بسازید.",
-        "MY"                => "حساب من",
+        "MY" => "حساب من",
 
-        "SESSION_COMPROMISED"       => "ممکن است سژن شما مورد حمله واقع شده باشد. بهتر است با همه دستگاه های خود از وب سایت خارج شوید و دوباره وارد شوید. همچنین توجه بفرمایید که اطلاعات حسابتان، مورد حمله واقع نشده باشد. ",
+        "SESSION_COMPROMISED" => "ممکن است سژن شما مورد حمله واقع شده باشد. بهتر است با همه دستگاه های خود از وب سایت خارج شوید و دوباره وارد شوید. همچنین توجه بفرمایید که اطلاعات حسابتان، مورد حمله واقع نشده باشد. ",
         "SESSION_COMPROMISED_TITLE" => "ممکن است که اکانت شما مورد حمله واقع شده باشد",
-        "SESSION_EXPIRED"       => "سژن شما به پایان رسیده است. لطفا دوباره وارد شوید.",
+        "SESSION_EXPIRED" => "سژن شما به پایان رسیده است. لطفا دوباره وارد شوید.",
 
         "SETTINGS" => [
-            "@TRANSLATION"  => "تنظیمات حساب",
-            "DESCRIPTION"   => "اطلاعات حسابتان یعنی پست الکترونیکی،نام و گذرواژه خود را به روز رسانی کنید",
-            "UPDATED"       => "تنظیمات حساب به روز رسانی شد"
+            "@TRANSLATION" => "تنظیمات حساب",
+            "DESCRIPTION" => "اطلاعات حسابتان یعنی پست الکترونیکی،نام و گذرواژه خود را به روز رسانی کنید",
+            "UPDATED" => "تنظیمات حساب به روز رسانی شد"
         ],
 
         "TOOLS" => "ابزار حساب",
@@ -42,19 +42,19 @@ return [
         "UNVERIFIED" => "شما هنوز آدرس پست الکترونیکی خود را فعال نکرده اید. برای فعال سازی لطفا ایمیل خود را چک کنید.",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"     => "لینک فعال سازی برای ایمیل {{email}} ارسال شد. لطفا ایمیل خود را چک کنید.",
-            "RESEND"            => "ارسال دوباره ایمیل فعال سازی",
-            "COMPLETE"          => "شما پست الکترونیکی خود را با موفقیت فعال سازی کردید. حالا می توانید وارد شوید.",
-            "EMAIL"             => "لطفا آدرس پست الکترونیکی که با آن ثبت نام کردید وارد کنید تا ایمیل فعال سازی دوباره برایتان ارسال شود.",
-            "PAGE"              => "ارسال دوباره ایمیل فعال سازی برای حساب جدید شما",
-            "SEND"              => "ارسال ایمیل فعال سازی برای حساب کاربری",
-            "TOKEN_NOT_FOUND"   => "این حساب کاربری یا قبلا فعال شده است و یا کد فعال سازی موجود نیست.",
+            "NEW_LINK_SENT" => "لینک فعال سازی برای ایمیل {{email}} ارسال شد. لطفا ایمیل خود را چک کنید.",
+            "RESEND" => "ارسال دوباره ایمیل فعال سازی",
+            "COMPLETE" => "شما پست الکترونیکی خود را با موفقیت فعال سازی کردید. حالا می توانید وارد شوید.",
+            "EMAIL" => "لطفا آدرس پست الکترونیکی که با آن ثبت نام کردید وارد کنید تا ایمیل فعال سازی دوباره برایتان ارسال شود.",
+            "PAGE" => "ارسال دوباره ایمیل فعال سازی برای حساب جدید شما",
+            "SEND" => "ارسال ایمیل فعال سازی برای حساب کاربری",
+            "TOKEN_NOT_FOUND" => "این حساب کاربری یا قبلا فعال شده است و یا کد فعال سازی موجود نیست.",
         ]
     ],
 
     "EMAIL" => [
-        "INVALID"               => "حساب کاربری با <strong>{{email}}</strong> ثبت نشده است.",
-        "IN_USE"                => "ایمیل <strong>{{email}}</strong> قبلا استفاده شده است",
+        "INVALID" => "حساب کاربری با <strong>{{email}}</strong> ثبت نشده است.",
+        "IN_USE" => "ایمیل <strong>{{email}}</strong> قبلا استفاده شده است",
         "VERIFICATION_REQUIRED" => "آدرس پست الکترونیکی را بصورت صحیح وارد کنید"
     ],
 
@@ -72,10 +72,10 @@ return [
     ],
 
     "LOGIN" => [
-        "@TRANSLATION"      => "ورود",
-        "ALREADY_COMPLETE"  => "شما قبلا وارد شده اید.",
-        "SOCIAL"            => "یا با روش های زیر وارد شوید",
-        "REQUIRED"          => "برای دیدن این صفحه لازم است که وارد شوید"
+        "@TRANSLATION" => "ورود",
+        "ALREADY_COMPLETE" => "شما قبلا وارد شده اید.",
+        "SOCIAL" => "یا با روش های زیر وارد شوید",
+        "REQUIRED" => "برای دیدن این صفحه لازم است که وارد شوید"
     ],
 
     "LOGOUT" => "خروج",
@@ -86,93 +86,93 @@ return [
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"   => "به حساب کاربری خود در {{site_name}} وارد شوید و یا حساب کاربری جدیدی بسازید",
-            "SUBTITLE"      => "ثبت نام کنید و یا با حساب کاربری خود وارد شوید",
-            "TITLE"         => "بیایید شروع کنیم!",
+            "DESCRIPTION" => "به حساب کاربری خود در {{site_name}} وارد شوید و یا حساب کاربری جدیدی بسازید",
+            "SUBTITLE" => "ثبت نام کنید و یا با حساب کاربری خود وارد شوید",
+            "TITLE" => "بیایید شروع کنیم!",
         ]
     ],
 
     "PASSWORD" => [
         "@TRANSLATION" => "گذرواژه",
 
-        "BETWEEN"   => "بین {{min}}-{{max}} حرف",
+        "BETWEEN" => "بین {{min}}-{{max}} حرف",
 
-        "CONFIRM"               => "رمز عبور را وارد کنید",
-        "CONFIRM_CURRENT"       => "لطفا رمز عبور فعلی را تایید کنید",
-        "CONFIRM_NEW"           => "رمز عبور جدید را وارد کنید",
-        "CONFIRM_NEW_EXPLAIN"   => "رمز عبور جدید را تکرار کنید",
-        "CONFIRM_NEW_HELP"      => "فقط زمانی لازم است که می خواهید گذرواژه جدیدی انتخاب کنید",
-        "CURRENT"               => "گذرواژه فعلی",
-        "CURRENT_EXPLAIN"       => "شما باید گذرواژه فعلی خود را وارد کنید تا بتوانید اطلاعات را به روز رسانی کنید",
+        "CONFIRM" => "رمز عبور را وارد کنید",
+        "CONFIRM_CURRENT" => "لطفا رمز عبور فعلی را تایید کنید",
+        "CONFIRM_NEW" => "رمز عبور جدید را وارد کنید",
+        "CONFIRM_NEW_EXPLAIN" => "رمز عبور جدید را تکرار کنید",
+        "CONFIRM_NEW_HELP" => "فقط زمانی لازم است که می خواهید گذرواژه جدیدی انتخاب کنید",
+        "CURRENT" => "گذرواژه فعلی",
+        "CURRENT_EXPLAIN" => "شما باید گذرواژه فعلی خود را وارد کنید تا بتوانید اطلاعات را به روز رسانی کنید",
 
         "FORGOTTEN" => "فراموشی گذرواژه",
         "FORGET" => [
             "@TRANSLATION" => "گذرواژه خود را فراموش کرده ام",
 
-            "COULD_NOT_UPDATE"  => "گذرواژه به روز رسانی نشد",
-            "EMAIL"             => "لطفا آدرس پست الکترونیکی که در زمان ثبت نام استفاده کردید، وارد کنید. لینک بازیابی گذرواژه برای شما ایمیل خواهد شد.",
-            "EMAIL_SEND"        => "لینک بازیابی گذرواژه ایمیل شود",
-            "INVALID"           => "درخواست بازیابی کذرواژه پیدا نشد و یا منقضی شده است. لطفا درخواست را <a href=\"{{url}}\">دوباره ارسال کنید<a>",
-            "PAGE"              => "دریافت لینک بازیابی گذرواژه",
-            "REQUEST_CANNED"    => "درخواست فراموشی گذرواژه، حذف شد.",
-            "REQUEST_SENT"      => "ایمیل بازیابی گذرواژه به <strong>{{email}}</strong> ارسال شد."
+            "COULD_NOT_UPDATE" => "گذرواژه به روز رسانی نشد",
+            "EMAIL" => "لطفا آدرس پست الکترونیکی که در زمان ثبت نام استفاده کردید، وارد کنید. لینک بازیابی گذرواژه برای شما ایمیل خواهد شد.",
+            "EMAIL_SEND" => "لینک بازیابی گذرواژه ایمیل شود",
+            "INVALID" => "درخواست بازیابی کذرواژه پیدا نشد و یا منقضی شده است. لطفا درخواست را <a href=\"{{url}}\">دوباره ارسال کنید<a>",
+            "PAGE" => "دریافت لینک بازیابی گذرواژه",
+            "REQUEST_CANNED" => "درخواست فراموشی گذرواژه، حذف شد.",
+            "REQUEST_SENT" => "ایمیل بازیابی گذرواژه به <strong>{{email}}</strong> ارسال شد."
         ],
 
         "RESET" => [
-            "@TRANSLATION"      => "تغییر گذرواژه",
-            "CHOOSE"            => "لطفا گذرواژه جدید را انتخاب کنید",
-            "PAGE"              => "برای حساب خود، گذرواژه جدیدی انتخاب کنید.",
-            "SEND"              => "گذرواژه جدید را انتخاب کرده و وارد شوید"
+            "@TRANSLATION" => "تغییر گذرواژه",
+            "CHOOSE" => "لطفا گذرواژه جدید را انتخاب کنید",
+            "PAGE" => "برای حساب خود، گذرواژه جدیدی انتخاب کنید.",
+            "SEND" => "گذرواژه جدید را انتخاب کرده و وارد شوید"
         ],
 
-        "HASH_FAILED"       => "هشینگ گذرواژه با مشکل روبرو شد. لطفا با مسولین وب سایت تماس برقرار کنید",
-        "INVALID"           => "گذرواژه فعلی درست وارد نشده است",
-        "NEW"               => "گذرواژه جدید",
+        "HASH_FAILED" => "هشینگ گذرواژه با مشکل روبرو شد. لطفا با مسولین وب سایت تماس برقرار کنید",
+        "INVALID" => "گذرواژه فعلی درست وارد نشده است",
+        "NEW" => "گذرواژه جدید",
         "NOTHING_TO_UPDATE" => "شما نمیتوانید همان گذرواژه را دوباره وارد کنید",
-        "UPDATED"           => "گذرواژه به روز رسانی شد"
+        "UPDATED" => "گذرواژه به روز رسانی شد"
     ],
 
-    "PROFILE"       => [
-        "SETTINGS"  => "تنظیمات شخصی حساب",
-        "UPDATED"   => "تنظیمات شخصی حساب به روز رسانی شد"
+    "PROFILE" => [
+        "SETTINGS" => "تنظیمات شخصی حساب",
+        "UPDATED" => "تنظیمات شخصی حساب به روز رسانی شد"
     ],
 
-    "REGISTER"      => "ثبت نام",
-    "REGISTER_ME"   => "ثبت نام کن",
+    "REGISTER" => "ثبت نام",
+    "REGISTER_ME" => "ثبت نام کن",
 
     "REGISTRATION" => [
-        "BROKEN"            => "متاسفانه پروسه ثبت نام با مشکلی روبرو شد. برای دریافت کمک لطفا با ما تماس بگیرید.",
-        "COMPLETE_TYPE1"    => "شما با موفقیت ثبت نام کردید. حالا میتوانید وارد شوید.",
-        "COMPLETE_TYPE2"    => "شما با موفقیت ثبت نام کردید. لینک فعال سازی حساب به آدرس پست الکترونیکیتان <strong>{{email}}</strong> ارسال شد. بدون فعال سازی نمیتوانید وارد شوید.",
-        "DISABLED"          => "با عرض تاسف، امکان ثبت در وب سایت، غیر فعال شده است.",
-        "LOGOUT"            => "شما همزمان این که وارد شده اید نمیتوانید حساب کاربری جدیدی بسازید. لطفا ابتدا خارج شوید.",
-        "WELCOME"           => "سریع و ساده ثبت نام کنید"
+        "BROKEN" => "متاسفانه پروسه ثبت نام با مشکلی روبرو شد. برای دریافت کمک لطفا با ما تماس بگیرید.",
+        "COMPLETE_TYPE1" => "شما با موفقیت ثبت نام کردید. حالا میتوانید وارد شوید.",
+        "COMPLETE_TYPE2" => "شما با موفقیت ثبت نام کردید. لینک فعال سازی حساب به آدرس پست الکترونیکیتان <strong>{{email}}</strong> ارسال شد. بدون فعال سازی نمیتوانید وارد شوید.",
+        "DISABLED" => "با عرض تاسف، امکان ثبت در وب سایت، غیر فعال شده است.",
+        "LOGOUT" => "شما همزمان این که وارد شده اید نمیتوانید حساب کاربری جدیدی بسازید. لطفا ابتدا خارج شوید.",
+        "WELCOME" => "سریع و ساده ثبت نام کنید"
     ],
 
-    "RATE_LIMIT_EXCEEDED"       => "شما محدودیت تعداد انجام این کار را پشت سر گذاشتید. لطفا {{delay}} ثانیه دیگر صبر کرده و دوباره تلاش کنید.",
-    "REMEMBER_ME"               => "من را به خاطر بسپار!",
-    "REMEMBER_ME_ON_COMPUTER"   => "من را در این دستگاه به خاطر بسپار (برای دستگاه های عمومی پیشنهاد نمی شود)",
+    "RATE_LIMIT_EXCEEDED" => "شما محدودیت تعداد انجام این کار را پشت سر گذاشتید. لطفا {{delay}} ثانیه دیگر صبر کرده و دوباره تلاش کنید.",
+    "REMEMBER_ME" => "من را به خاطر بسپار!",
+    "REMEMBER_ME_ON_COMPUTER" => "من را در این دستگاه به خاطر بسپار (برای دستگاه های عمومی پیشنهاد نمی شود)",
 
-    "SIGNIN"                => "ورود",
-    "SIGNIN_OR_REGISTER"    => "ثبت نام کنید و یا وارد شوید",
-    "SIGNUP"                => "ثبت نام",
+    "SIGNIN" => "ورود",
+    "SIGNIN_OR_REGISTER" => "ثبت نام کنید و یا وارد شوید",
+    "SIGNUP" => "ثبت نام",
 
-    "TOS"           => "شرایط و مقررات",
+    "TOS" => "شرایط و مقررات",
     "TOS_AGREEMENT" => "با ثبت نام در {{site_title}} موافقت خود با <a {{link_attributes | raw}}>شرایط و مقررات</a> را نشان میدهید.",
-    "TOS_FOR"       => "شرایط و مقررات {{title}}",
+    "TOS_FOR" => "شرایط و مقررات {{title}}",
 
     "USERNAME" => [
         "@TRANSLATION" => "نام کاربری",
 
-        "CHOOSE"        => "یک نام کاربری منحصر به فرد انتخاب کنید",
-        "INVALID"       => "نام کاربری معتبر نیست",
-        "IN_USE"        => "نام کاربری <strong>{{user_name}}</strong> قبلا استفاده شده است",
+        "CHOOSE" => "یک نام کاربری منحصر به فرد انتخاب کنید",
+        "INVALID" => "نام کاربری معتبر نیست",
+        "IN_USE" => "نام کاربری <strong>{{user_name}}</strong> قبلا استفاده شده است",
         "NOT_AVAILABLE" => "نام کاربری <strong>{{user_name}}</strong> موجود نیست. لطفا نام کاربری دیگری انتخاب کنید"
     ],
 
-    "USER_ID_INVALID"       => "آی دی کاربری مد نظر شما موجود نیست",
+    "USER_ID_INVALID" => "آی دی کاربری مد نظر شما موجود نیست",
     "USER_OR_EMAIL_INVALID" => "نام کاربری و یا آدرس پست الکترونیکی معتبر نیست",
-    "USER_OR_PASS_INVALID"  => "کاربری یافت نشد و یا گذرواژه صحیح نیست",
+    "USER_OR_PASS_INVALID" => "کاربری یافت نشد و یا گذرواژه صحیح نیست",
 
     "WELCOME" => "خوش آمدید {{first_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/fa/validate.php b/main/app/sprinkles/account/locale/fa/validate.php
index a63cae1..4e8dc74 100644
--- a/main/app/sprinkles/account/locale/fa/validate.php
+++ b/main/app/sprinkles/account/locale/fa/validate.php
@@ -13,7 +13,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "گذرواژه و تکرار آن باید با یکدیگر تطبیق پیدا کنند",
         "USERNAME" => "نام کاربری فقط میتواند از حروف کوچک، اعداد، '.'، '-' و '_' متشکل شوند."
     ]
diff --git a/main/app/sprinkles/account/locale/fr_FR/messages.php b/main/app/sprinkles/account/locale/fr_FR/messages.php
index 6e5a032..9de347f 100644
--- a/main/app/sprinkles/account/locale/fr_FR/messages.php
+++ b/main/app/sprinkles/account/locale/fr_FR/messages.php
@@ -24,18 +24,18 @@ return [
         "INVALID" => "Ce compte n'existe pas. Il a peut-être été supprimé. Veuillez nous contacter pour plus d'informations.",
 
         "MASTER_NOT_EXISTS" => "Vous ne pouvez pas enregistrer un compte tant que le compte principal n'a pas été créé!",
-        "MY"                => "Mon compte",
+        "MY" => "Mon compte",
 
         "SESSION_COMPROMISED" => [
-            "@TRANSLATION"  => "Votre session a été compromise. Vous devez vous déconnecter de tous les périphériques, puis vous reconnecter et vous assurer que vos données n'ont pas été altérées.",
-            "TITLE"         => "Votre compte peut avoir été compromis"
+            "@TRANSLATION" => "Votre session a été compromise. Vous devez vous déconnecter de tous les périphériques, puis vous reconnecter et vous assurer que vos données n'ont pas été altérées.",
+            "TITLE" => "Votre compte peut avoir été compromis"
         ],
-        "SESSION_EXPIRED"           => "Votre session a expiré. Veuillez vous connecter à nouveau.",
+        "SESSION_EXPIRED" => "Votre session a expiré. Veuillez vous connecter à nouveau.",
 
         "SETTINGS" => [
-            "@TRANSLATION"  => "Paramètres du compte",
-            "DESCRIPTION"   => "Mettez à jour les paramètres de votre compte, y compris votre adresse e-mail, votre nom et votre mot de passe.",
-            "UPDATED"       => "Paramètres du compte mis à jour"
+            "@TRANSLATION" => "Paramètres du compte",
+            "DESCRIPTION" => "Mettez à jour les paramètres de votre compte, y compris votre adresse e-mail, votre nom et votre mot de passe.",
+            "UPDATED" => "Paramètres du compte mis à jour"
         ],
 
         "TOOLS" => "Outils du compte",
@@ -43,19 +43,19 @@ return [
         "UNVERIFIED" => "Votre compte n'a pas encore été vérifié. Vérifiez vos emails / dossier spam pour les instructions d'activation du compte.",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"     => "Nous avons envoyé un nouveau lien de vérification à {{email}}. Veuillez vérifier vos dossiers de boîte de réception et de spam pour ce courriel.",
-            "RESEND"            => "Renvoyer le courriel de validation",
-            "COMPLETE"          => "Votre compte a été validé. Vous pouvez maintenant vous connecter.",
-            "EMAIL"             => "Veuillez saisir l'adresse email que vous avez utilisée pour vous inscrire et votre courriel de vérification sera renvoyé.",
-            "PAGE"              => "Renvoyer l'email de validation de votre nouveau compte.",
-            "SEND"              => "Envoyer le lien de validation de mon compte",
-            "TOKEN_NOT_FOUND"   => "Le jeton de vérification n'existe pas / Le compte est déjà vérifié",
+            "NEW_LINK_SENT" => "Nous avons envoyé un nouveau lien de vérification à {{email}}. Veuillez vérifier vos dossiers de boîte de réception et de spam pour ce courriel.",
+            "RESEND" => "Renvoyer le courriel de validation",
+            "COMPLETE" => "Votre compte a été validé. Vous pouvez maintenant vous connecter.",
+            "EMAIL" => "Veuillez saisir l'adresse email que vous avez utilisée pour vous inscrire et votre courriel de vérification sera renvoyé.",
+            "PAGE" => "Renvoyer l'email de validation de votre nouveau compte.",
+            "SEND" => "Envoyer le lien de validation de mon compte",
+            "TOKEN_NOT_FOUND" => "Le jeton de vérification n'existe pas / Le compte est déjà vérifié",
         ]
     ],
 
     "EMAIL" => [
         "INVALID" => "Il n'y a aucun compte pour <strong>{{email}}</strong>.",
-        "IN_USE"  => "Le email <strong>{{email}}</strong> est déjà utilisé.",
+        "IN_USE" => "Le email <strong>{{email}}</strong> est déjà utilisé.",
         "VERIFICATION_REQUIRED" => "Email (vérification requise - utiliser une adresse réelle!)"
     ],
 
@@ -74,9 +74,9 @@ return [
 
     "LOGIN" => [
         "@TRANSLATION" => "Connexion",
-        "ALREADY_COMPLETE"  => "Vous êtes déjà connecté!",
-        "SOCIAL"            => "Ou se connecter avec",
-        "REQUIRED"          => "Désolé, vous devez être connecté pour accéder à cette ressource."
+        "ALREADY_COMPLETE" => "Vous êtes déjà connecté!",
+        "SOCIAL" => "Ou se connecter avec",
+        "REQUIRED" => "Désolé, vous devez être connecté pour accéder à cette ressource."
     ],
 
     "LOGOUT" => "Déconnexion",
@@ -87,9 +87,9 @@ return [
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"   => "Connectez-vous à votre compte {{site_name}} ou enregistrez-vous pour un nouveau compte.",
-            "SUBTITLE"      => "Inscrivez-vous gratuitement ou connectez-vous avec un compte existant.",
-            "TITLE"         => "Commençons!",
+            "DESCRIPTION" => "Connectez-vous à votre compte {{site_name}} ou enregistrez-vous pour un nouveau compte.",
+            "SUBTITLE" => "Inscrivez-vous gratuitement ou connectez-vous avec un compte existant.",
+            "TITLE" => "Commençons!",
         ]
     ],
 
@@ -98,82 +98,82 @@ return [
 
         "BETWEEN" => "Entre {{min}} et {{max}} charactères",
 
-        "CONFIRM"               => "Confirmer le mot de passe",
-        "CONFIRM_CURRENT"       => "Veuillez confirmer votre mot de passe actuel",
-        "CONFIRM_NEW"           => "Confirmer le nouveau mot de passe",
-        "CONFIRM_NEW_EXPLAIN"   => "Confirmer le mot de passe",
-        "CONFIRM_NEW_HELP"      => "Obligatoire uniquement si vous sélectionnez un nouveau mot de passe",
-        "CURRENT"               => "Mot de passe actuel",
-        "CURRENT_EXPLAIN"       => "Vous devez confirmer votre mot de passe actuel pour apporter des modifications",
+        "CONFIRM" => "Confirmer le mot de passe",
+        "CONFIRM_CURRENT" => "Veuillez confirmer votre mot de passe actuel",
+        "CONFIRM_NEW" => "Confirmer le nouveau mot de passe",
+        "CONFIRM_NEW_EXPLAIN" => "Confirmer le mot de passe",
+        "CONFIRM_NEW_HELP" => "Obligatoire uniquement si vous sélectionnez un nouveau mot de passe",
+        "CURRENT" => "Mot de passe actuel",
+        "CURRENT_EXPLAIN" => "Vous devez confirmer votre mot de passe actuel pour apporter des modifications",
 
         "FORGOTTEN" => "Mot de passe oublié",
         "FORGET" => [
             "@TRANSLATION" => "J'ai oublié mon mot de passe",
 
-            "COULD_NOT_UPDATE"  => "Impossible de mettre à jour le mot de passe.",
-            "EMAIL"             => "Veuillez saisir l'adresse e-mail que vous avez utilisée pour vous inscrire. Un lien avec les instructions pour réinitialiser votre mot de passe vous sera envoyé par email.",
-            "EMAIL_SEND"        => "Envoyer le lien de réinitialisation",
-            "INVALID"           => "Cette requête de réinitialisation de mot de passe n'a pas pu être trouvée ou a expiré. Veuillez réessayer <a href=\"{{url}}\"> de soumettre votre demande <a>.",
-            "PAGE"              => "Obtenir un lien pour réinitialiser votre mot de passe.",
-            "REQUEST_CANNED"    => "Demande de mot de passe perdu annulée.",
-            "REQUEST_SENT"      => "Si l'adresse e-mail <strong>{{email}}</strong> correspond à un compte dans notre système, un lien de réinitialisation de mot de passe sera envoyé à <strong>{{email}}</strong>."
+            "COULD_NOT_UPDATE" => "Impossible de mettre à jour le mot de passe.",
+            "EMAIL" => "Veuillez saisir l'adresse e-mail que vous avez utilisée pour vous inscrire. Un lien avec les instructions pour réinitialiser votre mot de passe vous sera envoyé par email.",
+            "EMAIL_SEND" => "Envoyer le lien de réinitialisation",
+            "INVALID" => "Cette requête de réinitialisation de mot de passe n'a pas pu être trouvée ou a expiré. Veuillez réessayer <a href=\"{{url}}\"> de soumettre votre demande <a>.",
+            "PAGE" => "Obtenir un lien pour réinitialiser votre mot de passe.",
+            "REQUEST_CANNED" => "Demande de mot de passe perdu annulée.",
+            "REQUEST_SENT" => "Si l'adresse e-mail <strong>{{email}}</strong> correspond à un compte dans notre système, un lien de réinitialisation de mot de passe sera envoyé à <strong>{{email}}</strong>."
         ],
 
         "RESET" => [
-            "@TRANSLATION"      => "Réinitialiser le mot de passe",
-            "CHOOSE"            => "Veuillez choisir un nouveau mot de passe pour continuer.",
-            "PAGE"              => "Choisissez un nouveau mot de passe pour votre compte.",
-            "SEND"              => "Définir un nouveau mot de passe"
+            "@TRANSLATION" => "Réinitialiser le mot de passe",
+            "CHOOSE" => "Veuillez choisir un nouveau mot de passe pour continuer.",
+            "PAGE" => "Choisissez un nouveau mot de passe pour votre compte.",
+            "SEND" => "Définir un nouveau mot de passe"
         ],
 
-        "HASH_FAILED"       => "Le hachage du mot de passe a échoué. Veuillez contacter un administrateur de site.",
-        "INVALID"           => "Le mot de passe actuel ne correspond pas à celui que nous avons au dossier",
-        "NEW"               => "Nouveau mot de passe",
+        "HASH_FAILED" => "Le hachage du mot de passe a échoué. Veuillez contacter un administrateur de site.",
+        "INVALID" => "Le mot de passe actuel ne correspond pas à celui que nous avons au dossier",
+        "NEW" => "Nouveau mot de passe",
         "NOTHING_TO_UPDATE" => "Vous ne pouvez pas mettre à jour avec le même mot de passe",
-        "UPDATED"           => "Mot de passe du compte mis à jour"
+        "UPDATED" => "Mot de passe du compte mis à jour"
     ],
 
-    "PROFILE"       => [
-        "SETTINGS"  => "Paramètres du profil",
-        "UPDATED"   => "Paramètres du profil mis à jour"
+    "PROFILE" => [
+        "SETTINGS" => "Paramètres du profil",
+        "UPDATED" => "Paramètres du profil mis à jour"
     ],
 
-    "REGISTER"      => "S'inscrire",
-    "REGISTER_ME"   => "S'inscrire",
+    "REGISTER" => "S'inscrire",
+    "REGISTER_ME" => "S'inscrire",
 
     "REGISTRATION" => [
-        "BROKEN"         => "Nous sommes désolés, il ya un problème avec notre processus d'enregistrement de compte. Veuillez nous contacter directement pour obtenir de l'aide.",
+        "BROKEN" => "Nous sommes désolés, il ya un problème avec notre processus d'enregistrement de compte. Veuillez nous contacter directement pour obtenir de l'aide.",
         "COMPLETE_TYPE1" => "Vous êtes inscrit avec succès. Vous pouvez maintenant vous connecter.",
         "COMPLETE_TYPE2" => "Vous êtes inscrit avec succès. Vous recevrez bientôt un e-mail de validation contenant un lien pour activer votre compte. Vous ne pourrez pas vous connecter avant d'avoir terminé cette étape.",
-        "DISABLED"       => "Désolé, l'enregistrement de compte a été désactivé.",
-        "LOGOUT"         => "Désolé, vous ne pouvez pas vous inscrire tout en étant connecté. Veuillez vous déconnecter en premier.",
-        "WELCOME"        => "L'inscription est rapide et simple."
+        "DISABLED" => "Désolé, l'enregistrement de compte a été désactivé.",
+        "LOGOUT" => "Désolé, vous ne pouvez pas vous inscrire tout en étant connecté. Veuillez vous déconnecter en premier.",
+        "WELCOME" => "L'inscription est rapide et simple."
     ],
 
-    "RATE_LIMIT_EXCEEDED"       => "La limite de tentatives pour cette action a été dépassée. Vous devez attendre {{delay}} secondes avant de pouvoir effectuer une autre tentative.",
-    "REMEMBER_ME"               => "Se souvenir de moi!",
-    "REMEMBER_ME_ON_COMPUTER"   => "Se souvenir de moi sur cet ordinateur (non recommandé pour les ordinateurs publics)",
+    "RATE_LIMIT_EXCEEDED" => "La limite de tentatives pour cette action a été dépassée. Vous devez attendre {{delay}} secondes avant de pouvoir effectuer une autre tentative.",
+    "REMEMBER_ME" => "Se souvenir de moi!",
+    "REMEMBER_ME_ON_COMPUTER" => "Se souvenir de moi sur cet ordinateur (non recommandé pour les ordinateurs publics)",
 
-    "SIGNIN"             => "Se connecter",
+    "SIGNIN" => "Se connecter",
     "SIGNIN_OR_REGISTER" => "Se connecter ou s'inscrire",
-    "SIGNUP"             => "S'inscrire",
+    "SIGNUP" => "S'inscrire",
 
-    "TOS"           => "Termes et conditions",
+    "TOS" => "Termes et conditions",
     "TOS_AGREEMENT" => "En créant un compte avec {{site_title}}, vous acceptez les <a {{link_attributes | raw}}>termes et conditions</a>.",
-    "TOS_FOR"       => "Termes et conditions pour {{title}}",
+    "TOS_FOR" => "Termes et conditions pour {{title}}",
 
     "USERNAME" => [
         "@TRANSLATION" => "Nom d'utilisateur",
 
-        "CHOOSE"  => "Choisissez un nom d'utilisateur unique",
+        "CHOOSE" => "Choisissez un nom d'utilisateur unique",
         "INVALID" => "Nom d'utilisateur invalide",
-        "IN_USE"  => "Le nom d'utilisateur '{{username}}' est déjà utilisé.",
+        "IN_USE" => "Le nom d'utilisateur '{{username}}' est déjà utilisé.",
         "NOT_AVAILABLE" => "Le nom d'utilisateur <strong>{{user_name}}</strong> n'est pas disponible. Choisissez un autre nom, ou cliquez sur « suggérer »."
     ],
 
-    "USER_ID_INVALID"       => "L'identifiant d'utilisateur demandé n'existe pas.",
+    "USER_ID_INVALID" => "L'identifiant d'utilisateur demandé n'existe pas.",
     "USER_OR_EMAIL_INVALID" => "Nom d'utilisateur ou adresse e-mail non valide.",
-    "USER_OR_PASS_INVALID"  => "Nom d'utilisateur ou mot de passe incorrect.",
+    "USER_OR_PASS_INVALID" => "Nom d'utilisateur ou mot de passe incorrect.",
 
     "WELCOME" => "Bienvenue {{first_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/fr_FR/validate.php b/main/app/sprinkles/account/locale/fr_FR/validate.php
index 44b1bc1..2d4d65f 100644
--- a/main/app/sprinkles/account/locale/fr_FR/validate.php
+++ b/main/app/sprinkles/account/locale/fr_FR/validate.php
@@ -12,7 +12,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "Votre mot de passe et votre mot de passe de confirmation doivent correspondre."
     ]
 ];
diff --git a/main/app/sprinkles/account/locale/it_IT/messages.php b/main/app/sprinkles/account/locale/it_IT/messages.php
index fee2e8c..3c765b5 100644
--- a/main/app/sprinkles/account/locale/it_IT/messages.php
+++ b/main/app/sprinkles/account/locale/it_IT/messages.php
@@ -29,16 +29,16 @@ return [
         "MY" => "Il mio account",
 
         "SESSION_COMPROMISED" => [
-            "@TRANSLATION"  => "La tua sessione è stata compromessa. Devi eseguire il logout su tutti i dispositivi, quindi riaccenderti e assicurati che i tuoi dati non siano stati manomessi.",
-            "TITLE"         => "Il tuo account potrebbe essere stato compromesso",
-            "TEXT"          => "Qualcuno potrebbe aver utilizzato le tue informazioni di accesso per accedere a questa pagina. Per la tua sicurezza tutte le sessioni sono state disconnesse. <a href=\"{{url}}\">Accedi</a> e controlla l'account per attività sospette. Potresti anche desiderare di cambiare la tua password."
+            "@TRANSLATION" => "La tua sessione è stata compromessa. Devi eseguire il logout su tutti i dispositivi, quindi riaccenderti e assicurati che i tuoi dati non siano stati manomessi.",
+            "TITLE" => "Il tuo account potrebbe essere stato compromesso",
+            "TEXT" => "Qualcuno potrebbe aver utilizzato le tue informazioni di accesso per accedere a questa pagina. Per la tua sicurezza tutte le sessioni sono state disconnesse. <a href=\"{{url}}\">Accedi</a> e controlla l'account per attività sospette. Potresti anche desiderare di cambiare la tua password."
         ],
-        "SESSION_EXPIRED"       => "La tua sessione è scaduta. Accedi nuovamente.",
+        "SESSION_EXPIRED" => "La tua sessione è scaduta. Accedi nuovamente.",
 
         "SETTINGS" => [
-            "@TRANSLATION"  => "Impostazioni dell 'account",
-            "DESCRIPTION"   => "Aggiorna le impostazioni del tuo account, tra cui email, nome e password.",
-            "UPDATED"       => "Impostazioni account aggiornate"
+            "@TRANSLATION" => "Impostazioni dell 'account",
+            "DESCRIPTION" => "Aggiorna le impostazioni del tuo account, tra cui email, nome e password.",
+            "UPDATED" => "Impostazioni account aggiornate"
         ],
 
         "TOOLS" => "Account tools",
@@ -46,19 +46,19 @@ return [
         "UNVERIFIED" => "Il tuo account non è stato attivato. Controlla nella tua mail ( anche nella cartella dello spam ) per riceve le instruzioni per attivare il tuo account",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"     => "Ti è stato inviato un nuovo codice di attivazione, controlla la tua email ({{email}}).",
-            "RESEND"            => "Invia nuovamente email di verifica.",
-            "COMPLETE"          => "Hai verificato con successo il tuo account. È ora possibile accedere.",
-            "EMAIL"             => "Inserisci l'indirizzo email che hai utilizzato per registrarti e la tua email di verifica sarà resentata.",
-            "PAGE"              => "Ripeti l'email di verifica per il tuo nuovo account.",
-            "SEND"              => "Inviilo il collegamento di verifica per il mio account",
-            "TOKEN_NOT_FOUND"   => "Il token non esiste / l'account è già stato attivato"
+            "NEW_LINK_SENT" => "Ti è stato inviato un nuovo codice di attivazione, controlla la tua email ({{email}}).",
+            "RESEND" => "Invia nuovamente email di verifica.",
+            "COMPLETE" => "Hai verificato con successo il tuo account. È ora possibile accedere.",
+            "EMAIL" => "Inserisci l'indirizzo email che hai utilizzato per registrarti e la tua email di verifica sarà resentata.",
+            "PAGE" => "Ripeti l'email di verifica per il tuo nuovo account.",
+            "SEND" => "Inviilo il collegamento di verifica per il mio account",
+            "TOKEN_NOT_FOUND" => "Il token non esiste / l'account è già stato attivato"
         ]
     ],
 
     "EMAIL" => [
-        "INVALID"               => "Non esiste alcun account per <strong>{{email}}</strong>.",
-        "IN_USE"                => "L'email '{{email}}' è già in uso",
+        "INVALID" => "Non esiste alcun account per <strong>{{email}}</strong>.",
+        "IN_USE" => "L'email '{{email}}' è già in uso",
         "VERIFICATION_REQUIRED" => "Email (verifica richiesta - utilizzare un indirizzo reale!)"
     ],
 
@@ -72,14 +72,14 @@ return [
     "LOCALE" => [
         "ACCOUNT" => "La lingua e la località da utilizzare per il tuo account",
         "INVALID" => "<strong>{{locale}}</strong> non è una località valida.",
-        
-        
+
+
     ],
     "LOGIN" => [
-        "@TRANSLATION"      => "Accesso",
-        "ALREADY_COMPLETE"  => "Sei già loggato!",
-        "SOCIAL"            => "O accedi con",
-        "REQUIRED"          => "Devi essere loggato per accedere a questa risorsa"
+        "@TRANSLATION" => "Accesso",
+        "ALREADY_COMPLETE" => "Sei già loggato!",
+        "SOCIAL" => "O accedi con",
+        "REQUIRED" => "Devi essere loggato per accedere a questa risorsa"
     ],
     "LOGOUT" => "Logout",
 
@@ -89,98 +89,98 @@ return [
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"   => "Accedi al tuo account {{site_name}} o registrati per un nuovo account.",
-            "SUBTITLE"      => "Registrati gratuitamente o accedi con un account esistente.",
-            "TITLE"         => "Iniziamo!",
+            "DESCRIPTION" => "Accedi al tuo account {{site_name}} o registrati per un nuovo account.",
+            "SUBTITLE" => "Registrati gratuitamente o accedi con un account esistente.",
+            "TITLE" => "Iniziamo!",
         ]
     ],
 
     "PASSWORD" => [
         "@TRANSLATION" => "Password",
 
-        "BETWEEN"   => "La password deve essere tra {{min}} e i {{max}} caratteri",
+        "BETWEEN" => "La password deve essere tra {{min}} e i {{max}} caratteri",
 
-        "CONFIRM"               => "Conferma la password",
-        "CONFIRM_CURRENT"       => "Conferma la password attuale",
-        "CONFIRM_NEW"           => "Conferma la tua nuova password",
-        "CONFIRM_NEW_EXPLAIN"   => "Inserisci nuovamente la nuova password",
-        "CONFIRM_NEW_HELP"      => "Richiesto solo se si seleziona una nuova password",
+        "CONFIRM" => "Conferma la password",
+        "CONFIRM_CURRENT" => "Conferma la password attuale",
+        "CONFIRM_NEW" => "Conferma la tua nuova password",
+        "CONFIRM_NEW_EXPLAIN" => "Inserisci nuovamente la nuova password",
+        "CONFIRM_NEW_HELP" => "Richiesto solo se si seleziona una nuova password",
         "CREATE" => [
-            "@TRANSLATION"  => "Crea password",
-            "PAGE"          => "Scegli una password per il tuo nuovo account.",
-            "SET"           => "Imposta password e accedi"
+            "@TRANSLATION" => "Crea password",
+            "PAGE" => "Scegli una password per il tuo nuovo account.",
+            "SET" => "Imposta password e accedi"
         ],
-        "CURRENT"               => "Password attuale",
-        "CURRENT_EXPLAIN"       => "Devi confermare la tua password corrente per apportare modifiche",
+        "CURRENT" => "Password attuale",
+        "CURRENT_EXPLAIN" => "Devi confermare la tua password corrente per apportare modifiche",
 
         "FORGOTTEN" => "Password dimenticata",
         "FORGET" => [
             "@TRANSLATION" => "Ho dimenticato la mia password",
 
-            "COULD_NOT_UPDATE"  => "Password non aggiornata",
-            "EMAIL"             => "Inserisci l'indirizzo email che hai utilizzato per iscriverti. Un collegamento con le istruzioni per reimpostare la tua password verrà inviata via email.",
-            "EMAIL_SEND"        => "Email link di resetta password",
-            "INVALID"           => "Questa richiesta di ripristino della password non è stata trovata o è scaduta.  Prova a <a href=\"{{url}}\">riprovare</a> la tua richiesta.",
-            "PAGE"              => "Ottieni un collegamento per reimpostare la tua password.",
-            "REQUEST_CANNED"    => "Richiesta di recupero password cancellata.",
-            "REQUEST_SENT"      => "Se l'email <strong>{{email}}</strong> corrisponde a un account nel nostro sistema, verrà inviato un collegamento per la reimpostazione della password a <strong>{{email}}</strong>."
+            "COULD_NOT_UPDATE" => "Password non aggiornata",
+            "EMAIL" => "Inserisci l'indirizzo email che hai utilizzato per iscriverti. Un collegamento con le istruzioni per reimpostare la tua password verrà inviata via email.",
+            "EMAIL_SEND" => "Email link di resetta password",
+            "INVALID" => "Questa richiesta di ripristino della password non è stata trovata o è scaduta.  Prova a <a href=\"{{url}}\">riprovare</a> la tua richiesta.",
+            "PAGE" => "Ottieni un collegamento per reimpostare la tua password.",
+            "REQUEST_CANNED" => "Richiesta di recupero password cancellata.",
+            "REQUEST_SENT" => "Se l'email <strong>{{email}}</strong> corrisponde a un account nel nostro sistema, verrà inviato un collegamento per la reimpostazione della password a <strong>{{email}}</strong>."
         ],
 
-        "HASH_FAILED"       => "Hash della password fallito. Contatta l'amministratore di sistema.",
-        "INVALID"           => "La password corrente non corrisponde con quella in memoria",
-        "NEW"               => "Nuova Password",
+        "HASH_FAILED" => "Hash della password fallito. Contatta l'amministratore di sistema.",
+        "INVALID" => "La password corrente non corrisponde con quella in memoria",
+        "NEW" => "Nuova Password",
         "NOTHING_TO_UPDATE" => "Non puoi aggiornare con la stessa password",
 
         "RESET" => [
-            "@TRANSLATION"      => "Resetta la Password",
-            "CHOOSE"            => "Inserisci la tua nuova password",
-            "PAGE"              => "Scegli una nuova password per il tuo account.",
-            "SEND"              => "Impostare nuova password e accedere"
+            "@TRANSLATION" => "Resetta la Password",
+            "CHOOSE" => "Inserisci la tua nuova password",
+            "PAGE" => "Scegli una nuova password per il tuo account.",
+            "SEND" => "Impostare nuova password e accedere"
         ],
 
-        "UPDATED"           => "Password aggiornata"
+        "UPDATED" => "Password aggiornata"
     ],
 
-    "PROFILE"       => [
-        "SETTINGS"  => "Impostazioni del profilo",
-        "UPDATED"   => "Le impostazioni del profilo sono aggiornate"
+    "PROFILE" => [
+        "SETTINGS" => "Impostazioni del profilo",
+        "UPDATED" => "Le impostazioni del profilo sono aggiornate"
     ],
 
-    "RATE_LIMIT_EXCEEDED"       => "Il limite di velocità per questa azione è stato superato. Devi aspettare un altro {{delay}} secondi prima che ti sia permesso di fare un altro tentativo.",
-    "REGISTER"      => "Registrare",
-    "REGISTER_ME"   => "Iscrivimi",
+    "RATE_LIMIT_EXCEEDED" => "Il limite di velocità per questa azione è stato superato. Devi aspettare un altro {{delay}} secondi prima che ti sia permesso di fare un altro tentativo.",
+    "REGISTER" => "Registrare",
+    "REGISTER_ME" => "Iscrivimi",
     "REGISTRATION" => [
-        "BROKEN"            => "Ci dispiace, c'è un problema con il nostro processo di registrazione dell'account. Vi preghiamo di contattarci direttamente per assistenza.",
-        "COMPLETE_TYPE1"    => "Sei stato registrato con successo ora puoi eseguire il login",
-        "COMPLETE_TYPE2"    => "Sei stato registrato con successo. Riceverai presto una mail a <strong>{{email}}</strong> per l'attivazione. Devi attivare il tuo account prima di eseguire il login.",
-        "DISABLED"          => "La registrazione di nuovi account è stata bloccata",
-        "LOGOUT"            => "Non è possibile registrare un account mentre si è loggati",
-        "WELCOME"           => "La registrazione è semplice e veloce"
+        "BROKEN" => "Ci dispiace, c'è un problema con il nostro processo di registrazione dell'account. Vi preghiamo di contattarci direttamente per assistenza.",
+        "COMPLETE_TYPE1" => "Sei stato registrato con successo ora puoi eseguire il login",
+        "COMPLETE_TYPE2" => "Sei stato registrato con successo. Riceverai presto una mail a <strong>{{email}}</strong> per l'attivazione. Devi attivare il tuo account prima di eseguire il login.",
+        "DISABLED" => "La registrazione di nuovi account è stata bloccata",
+        "LOGOUT" => "Non è possibile registrare un account mentre si è loggati",
+        "WELCOME" => "La registrazione è semplice e veloce"
     ],
-    "REMEMBER_ME"               => "Ricordami!",
-    "REMEMBER_ME_ON_COMPUTER"   => "Ricordami su questo computer (non consigliato per i computer pubblici)",
+    "REMEMBER_ME" => "Ricordami!",
+    "REMEMBER_ME_ON_COMPUTER" => "Ricordami su questo computer (non consigliato per i computer pubblici)",
 
-    "SIGN_IN_HERE"          => "Hai già un account? <a href=\"{{url}}\">Accedi qui</a>",
-    "SIGNIN"                => "Accedi",
-    "SIGNIN_OR_REGISTER"    => "Accedi o registri",
-    "SIGNUP"                => "Registrazione",
+    "SIGN_IN_HERE" => "Hai già un account? <a href=\"{{url}}\">Accedi qui</a>",
+    "SIGNIN" => "Accedi",
+    "SIGNIN_OR_REGISTER" => "Accedi o registri",
+    "SIGNUP" => "Registrazione",
 
-    "TOS"           => "Termini e condizioni",
+    "TOS" => "Termini e condizioni",
     "TOS_AGREEMENT" => "Registrando un account con {{site_title}}, accetti il <a {{link_attributes | raw}}>termini e condizioni</a>.",
-    "TOS_FOR"       => "Termini e condizioni per {{title}}",
+    "TOS_FOR" => "Termini e condizioni per {{title}}",
 
     "USERNAME" => [
         "@TRANSLATION" => "Username",
 
-        "CHOOSE"        => "Inserisci il tuo username",
-        "INVALID"       => "Username non valido",
-        "IN_USE"        => "Il nome utente '{{user_name}}' è già in uso",
+        "CHOOSE" => "Inserisci il tuo username",
+        "INVALID" => "Username non valido",
+        "IN_USE" => "Il nome utente '{{user_name}}' è già in uso",
         "NOT_AVAILABLE" => "Il nome utente <strong>{{user_name}}</strong> non è disponibile. Scegli un nome diverso, oppure fai clic su \"suggerisci\"."
     ],
 
-    "USER_ID_INVALID"       => "User ID richiesto non è valido",
+    "USER_ID_INVALID" => "User ID richiesto non è valido",
     "USER_OR_EMAIL_INVALID" => "L'indirizzo mail o il nome utente non sono validi",
-    "USER_OR_PASS_INVALID"  => "Il nome utente o la password non sono validi",
+    "USER_OR_PASS_INVALID" => "Il nome utente o la password non sono validi",
 
     "WELCOME" => "Bentornato, {{display_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/it_IT/validate.php b/main/app/sprinkles/account/locale/it_IT/validate.php
index 713ccba..9fc7884 100644
--- a/main/app/sprinkles/account/locale/it_IT/validate.php
+++ b/main/app/sprinkles/account/locale/it_IT/validate.php
@@ -14,7 +14,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "I due campi devono combaciare",
         "USERNAME" => "L'username può essere composto da caratteri alfanumerici, '.', '-', e '_'."
     ]
diff --git a/main/app/sprinkles/account/locale/pt_PT/messages.php b/main/app/sprinkles/account/locale/pt_PT/messages.php
index 3db4200..0e8f3e1 100644
--- a/main/app/sprinkles/account/locale/pt_PT/messages.php
+++ b/main/app/sprinkles/account/locale/pt_PT/messages.php
@@ -24,18 +24,18 @@ return [
         "INVALID" => "Esta conta não existe. Pode ter sido removida.  Por favor contacte-nos para mais informações.",
 
         "MASTER_NOT_EXISTS" => "Não pode registrar uma conta enquanto a conta principal não for criada!",
-        "MY"                => "A minha conta",
+        "MY" => "A minha conta",
 
         "SESSION_COMPROMISED" => [
-            "@TRANSLATION"  => "A sua sessão foi comprometida.  Deverá fechar todas as sessões, voltar a iniciar sessão e verificar que os seus dados não foram alterados por alheios.",
-            "TITLE"         => "A sua sessão pode ter sido comprometida"
+            "@TRANSLATION" => "A sua sessão foi comprometida.  Deverá fechar todas as sessões, voltar a iniciar sessão e verificar que os seus dados não foram alterados por alheios.",
+            "TITLE" => "A sua sessão pode ter sido comprometida"
         ],
-        "SESSION_EXPIRED"       => "A sua sessão expirou. Por favor inicie nova sessão.",
+        "SESSION_EXPIRED" => "A sua sessão expirou. Por favor inicie nova sessão.",
 
         "SETTINGS" => [
-            "@TRANSLATION"  => "Definições de conta",
-            "DESCRIPTION"   => "Atualize as suas definições, incluindo email, nome e password.",
-            "UPDATED"       => "Definições de conta atualizadas"
+            "@TRANSLATION" => "Definições de conta",
+            "DESCRIPTION" => "Atualize as suas definições, incluindo email, nome e password.",
+            "UPDATED" => "Definições de conta atualizadas"
         ],
 
         "TOOLS" => "Ferramentas de conta",
@@ -43,19 +43,19 @@ return [
         "UNVERIFIED" => "A sua conta ainda não foi verificada. Consulte o seu email (incluindo a pasta de spam) para instruções de ativação.",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"     => "Enviámos um link de verificação para o endereço {{email}}. Por favor consulte o seu email (incluindo a pasta de spam).",
-            "RESEND"            => "Enviar novamente email de verificação",
-            "COMPLETE"          => "Verificou com sucesso a sua conta. Pode iniciar sessão.",
-            "EMAIL"             => "Por favor introduza o endereço de email que utilizou no registro e um email de verificação será enviado.",
-            "PAGE"              => "Reenviar email de verificação para a sua nova conta.",
-            "SEND"              => "Enviar email com link de verificação",
-            "TOKEN_NOT_FOUND"   => "Token de verificação inexistente / Conta já verificada",
+            "NEW_LINK_SENT" => "Enviámos um link de verificação para o endereço {{email}}. Por favor consulte o seu email (incluindo a pasta de spam).",
+            "RESEND" => "Enviar novamente email de verificação",
+            "COMPLETE" => "Verificou com sucesso a sua conta. Pode iniciar sessão.",
+            "EMAIL" => "Por favor introduza o endereço de email que utilizou no registro e um email de verificação será enviado.",
+            "PAGE" => "Reenviar email de verificação para a sua nova conta.",
+            "SEND" => "Enviar email com link de verificação",
+            "TOKEN_NOT_FOUND" => "Token de verificação inexistente / Conta já verificada",
         ]
     ],
 
     "EMAIL" => [
-        "INVALID"   => "Não existe nenhuma conta para <strong>{{email}}</strong>.",
-        "IN_USE"    => "O email <strong>{{email}}</strong> já se encontra em uso."
+        "INVALID" => "Não existe nenhuma conta para <strong>{{email}}</strong>.",
+        "IN_USE" => "O email <strong>{{email}}</strong> já se encontra em uso."
     ],
 
     "FIRST_NAME" => "Primeiro nome",
@@ -69,9 +69,9 @@ return [
     "LOGIN" => [
         "@TRANSLATION" => "Entrar",
 
-        "ALREADY_COMPLETE"  => "Sessão já iniciada!",
-        "SOCIAL"            => "Ou inicie sessão com",
-        "REQUIRED"          => "Lamentamos, tem de iniciar sessão para aceder a este recurso."
+        "ALREADY_COMPLETE" => "Sessão já iniciada!",
+        "SOCIAL" => "Ou inicie sessão com",
+        "REQUIRED" => "Lamentamos, tem de iniciar sessão para aceder a este recurso."
     ],
 
     "LOGOUT" => "Sair",
@@ -80,87 +80,87 @@ return [
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"   => "Inicie sessão na sua conta {{site_name}}, ou registre-se para uma nova conta.",
-            "SUBTITLE"      => "Registre-se gratuitamente, ou inicie sessão com uma conta existente.",
-            "TITLE"         => "Vamos começar!",
+            "DESCRIPTION" => "Inicie sessão na sua conta {{site_name}}, ou registre-se para uma nova conta.",
+            "SUBTITLE" => "Registre-se gratuitamente, ou inicie sessão com uma conta existente.",
+            "TITLE" => "Vamos começar!",
         ]
     ],
 
     "PASSWORD" => [
         "@TRANSLATION" => "Password",
 
-        "BETWEEN"   => "Entre {{min}}-{{max}} carateres",
+        "BETWEEN" => "Entre {{min}}-{{max}} carateres",
 
-        "CONFIRM"               => "Confirme a password",
-        "CONFIRM_CURRENT"       => "Por favor confirme a sua password atual",
-        "CONFIRM_NEW"           => "Confirmar Nova Password",
-        "CONFIRM_NEW_EXPLAIN"   => "Re-introduza a sua nova password",
-        "CONFIRM_NEW_HELP"      => "Apenas necessário se escolher uma nova password",
-        "CURRENT"               => "Password Atual",
-        "CURRENT_EXPLAIN"       => "Tem de confirmar a sua password atual para efetuar alterações",
+        "CONFIRM" => "Confirme a password",
+        "CONFIRM_CURRENT" => "Por favor confirme a sua password atual",
+        "CONFIRM_NEW" => "Confirmar Nova Password",
+        "CONFIRM_NEW_EXPLAIN" => "Re-introduza a sua nova password",
+        "CONFIRM_NEW_HELP" => "Apenas necessário se escolher uma nova password",
+        "CURRENT" => "Password Atual",
+        "CURRENT_EXPLAIN" => "Tem de confirmar a sua password atual para efetuar alterações",
 
         "FORGOTTEN" => "Password Esquecida",
         "FORGET" => [
             "@TRANSLATION" => "Esqueci a minha password",
 
-            "COULD_NOT_UPDATE"  => "Não foi possível atualizar a password.",
-            "EMAIL"             => "Por favor introduza o endereço de email que utilizou no registro. Enviaremos um email com instruções para efetuar o reset à sua password.",
-            "EMAIL_SEND"        => "Enviar email com link de reset da password",
-            "INVALID"           => "This password reset request could not be found, or has expired.  Please try <a href=\"{{url}}\">resubmitting your request<a>.",
-            "PAGE"              => "Obtenha um link para fazer reset à sua password.",
-            "REQUEST_CANNED"    => "Pedido de password esquecida foi cancelado.",
-            "REQUEST_SENT"      => "Se o email <strong>{{email}}</strong> corresponder a uma conta em nosso sistema, um link de redefinição de senha será enviado para <strong>{{email}}</strong>."
+            "COULD_NOT_UPDATE" => "Não foi possível atualizar a password.",
+            "EMAIL" => "Por favor introduza o endereço de email que utilizou no registro. Enviaremos um email com instruções para efetuar o reset à sua password.",
+            "EMAIL_SEND" => "Enviar email com link de reset da password",
+            "INVALID" => "This password reset request could not be found, or has expired.  Please try <a href=\"{{url}}\">resubmitting your request<a>.",
+            "PAGE" => "Obtenha um link para fazer reset à sua password.",
+            "REQUEST_CANNED" => "Pedido de password esquecida foi cancelado.",
+            "REQUEST_SENT" => "Se o email <strong>{{email}}</strong> corresponder a uma conta em nosso sistema, um link de redefinição de senha será enviado para <strong>{{email}}</strong>."
         ],
 
         "RESET" => [
-            "@TRANSLATION"      => "Reset Password",
-            "CHOOSE"            => "Por favor escolha uma nova password para continuar.",
-            "PAGE"              => "Escolha uma nova password para a sua conta.",
-            "SEND"              => "Definir nova password e registrar"
+            "@TRANSLATION" => "Reset Password",
+            "CHOOSE" => "Por favor escolha uma nova password para continuar.",
+            "PAGE" => "Escolha uma nova password para a sua conta.",
+            "SEND" => "Definir nova password e registrar"
         ],
 
-        "HASH_FAILED"       => "Falhou o hashing da password. Por favor contacte um administrador do site.",
-        "INVALID"           => "A password atual não coincide com a que temos em sistema",
-        "NEW"               => "Nova Password",
+        "HASH_FAILED" => "Falhou o hashing da password. Por favor contacte um administrador do site.",
+        "INVALID" => "A password atual não coincide com a que temos em sistema",
+        "NEW" => "Nova Password",
         "NOTHING_TO_UPDATE" => "Não pode atualizar para a mesma password",
-        "UPDATED"           => "Password da conta foi atualizada"
+        "UPDATED" => "Password da conta foi atualizada"
     ],
 
-    "REGISTER"      => "Registrar",
-    "REGISTER_ME"   => "Registrar-me",
+    "REGISTER" => "Registrar",
+    "REGISTER_ME" => "Registrar-me",
 
     "REGISTRATION" => [
-        "BROKEN"            => "Lamentamos, existe um problema com o nosso processo de registro.  Contacte-nos diretamente para assistência.",
-        "COMPLETE_TYPE1"    => "Registrou-se com sucesso.  Pode iniciar sessão.",
-        "COMPLETE_TYPE2"    => "Registrou-se com sucesso. Receberá em breve um email de verificação contendo um link para verificar a sua conta.  Não será possível iniciar sessão até completar este passo.",
-        "DISABLED"          => "Lamentamos, o registro de novas contas foi desativado.",
-        "LOGOUT"            => "Não pode registrar uma nova conta enquanto tiver sessão iniciada. Por favor feche a sua sessão primeiro.",
-        "WELCOME"           => "O registro é rápido e simples."
+        "BROKEN" => "Lamentamos, existe um problema com o nosso processo de registro.  Contacte-nos diretamente para assistência.",
+        "COMPLETE_TYPE1" => "Registrou-se com sucesso.  Pode iniciar sessão.",
+        "COMPLETE_TYPE2" => "Registrou-se com sucesso. Receberá em breve um email de verificação contendo um link para verificar a sua conta.  Não será possível iniciar sessão até completar este passo.",
+        "DISABLED" => "Lamentamos, o registro de novas contas foi desativado.",
+        "LOGOUT" => "Não pode registrar uma nova conta enquanto tiver sessão iniciada. Por favor feche a sua sessão primeiro.",
+        "WELCOME" => "O registro é rápido e simples."
     ],
 
-    "RATE_LIMIT_EXCEEDED"       => "Excedeu o número de tentativas para esta ação.  Tem de aguardar {{delay}} segundos até lhe ser permitida nova tentativa.",
-    "REMEMBER_ME"               => "Lembrar de mim!",
-    "REMEMBER_ME_ON_COMPUTER"   => "Lembrar de mim neste computador (não recomendado em computadores públicos)",
+    "RATE_LIMIT_EXCEEDED" => "Excedeu o número de tentativas para esta ação.  Tem de aguardar {{delay}} segundos até lhe ser permitida nova tentativa.",
+    "REMEMBER_ME" => "Lembrar de mim!",
+    "REMEMBER_ME_ON_COMPUTER" => "Lembrar de mim neste computador (não recomendado em computadores públicos)",
 
-    "SIGNIN"                => "Iniciar Sessão",
-    "SIGNIN_OR_REGISTER"    => "Iniciar sessão ou registrar",
-    "SIGNUP"                => "Registrar",
+    "SIGNIN" => "Iniciar Sessão",
+    "SIGNIN_OR_REGISTER" => "Iniciar sessão ou registrar",
+    "SIGNUP" => "Registrar",
 
-    "TOS"           => "Termos e Condições",
+    "TOS" => "Termos e Condições",
     "TOS_AGREEMENT" => "Ao registrar uma conta em {{site_title}}, está a aceitar os <a {{link_attributes | raw}}>termos e condições</a>.",
-    "TOS_FOR"       => "Termos e Condições para {{title}}",
+    "TOS_FOR" => "Termos e Condições para {{title}}",
 
     "USERNAME" => [
         "@TRANSLATION" => "Nome de utilizador",
 
-        "CHOOSE"  => "Escolha um nome de utilizador único",
+        "CHOOSE" => "Escolha um nome de utilizador único",
         "INVALID" => "Nome de utilizador inválido",
-        "IN_USE"  => "O nome de utilizador <strong>{{user_name}}</strong> já se encontra em uso."
+        "IN_USE" => "O nome de utilizador <strong>{{user_name}}</strong> já se encontra em uso."
     ],
 
-    "USER_ID_INVALID"       => "O id de utilizador solicitado não existe.",
+    "USER_ID_INVALID" => "O id de utilizador solicitado não existe.",
     "USER_OR_EMAIL_INVALID" => "Nome de utilizador ou endereço de email inválidos.",
-    "USER_OR_PASS_INVALID"  => "Nome de utilizador ou password inválidos.",
+    "USER_OR_PASS_INVALID" => "Nome de utilizador ou password inválidos.",
 
     "WELCOME" => "Bem-vindo, {{first_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/pt_PT/validate.php b/main/app/sprinkles/account/locale/pt_PT/validate.php
index c05f14c..4acc93e 100644
--- a/main/app/sprinkles/account/locale/pt_PT/validate.php
+++ b/main/app/sprinkles/account/locale/pt_PT/validate.php
@@ -12,7 +12,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "A password e respetiva confirmação têm de coincidir."
     ]
 ];
diff --git a/main/app/sprinkles/account/locale/ru_RU/messages.php b/main/app/sprinkles/account/locale/ru_RU/messages.php
index 328db13..ed7c123 100644
--- a/main/app/sprinkles/account/locale/ru_RU/messages.php
+++ b/main/app/sprinkles/account/locale/ru_RU/messages.php
@@ -10,7 +10,7 @@
  * @package userfrosting\i18n\ru_RU
  * @author @rendername
  */
- 
+
 return [
     "ACCOUNT" => [
         "@TRANSLATION" => "Аккаунт",
@@ -24,19 +24,19 @@ return [
         "INVALID" => "Этот аккаунт не существует. Возможно, он удалён.  Пожалуйста, свяжитесь с нами для получения дополнительной информации.",
 
         "MASTER_NOT_EXISTS" => "Вы не можете зарегистрировать аккаунт до тех пор, пока основная учётная запись не будет создана!",
-        "MY"                => "Мой профиль",
+        "MY" => "Мой профиль",
 
         "SESSION_COMPROMISED" => [
-            "@TRANSLATION"  => "Ваша сессия была скомпрометирована. Вы должны выйти на всех устройствах, а затем снова войти и убедиться, что ваши данные не были изменены.",
-            "TITLE"         => "Возможно, ваш аккаунт был скомпрометированн",
-            "TEXT"          => "Возможно, кто-то использовал ваши данные для входа на эту страницу. В целях безопасности все сеансы были завершены. Пожалуйста, повторно <a href=\"{{url}}\"> войдите </a> и проверьте свой аккаунт на подозрительную активность. Рекомендуем сменить пароль."
+            "@TRANSLATION" => "Ваша сессия была скомпрометирована. Вы должны выйти на всех устройствах, а затем снова войти и убедиться, что ваши данные не были изменены.",
+            "TITLE" => "Возможно, ваш аккаунт был скомпрометированн",
+            "TEXT" => "Возможно, кто-то использовал ваши данные для входа на эту страницу. В целях безопасности все сеансы были завершены. Пожалуйста, повторно <a href=\"{{url}}\"> войдите </a> и проверьте свой аккаунт на подозрительную активность. Рекомендуем сменить пароль."
         ],
-        "SESSION_EXPIRED"       => "Срок вашей сессии истек. Пожалуйста войдите еще раз.",
+        "SESSION_EXPIRED" => "Срок вашей сессии истек. Пожалуйста войдите еще раз.",
 
         "SETTINGS" => [
-            "@TRANSLATION"  => "Настройки аккаунта",
-            "DESCRIPTION"   => "Обновите настройки своего аккаунта, включая адрес электронной почты, имя и пароль.",
-            "UPDATED"       => "Данные аккаунта обновлены"
+            "@TRANSLATION" => "Настройки аккаунта",
+            "DESCRIPTION" => "Обновите настройки своего аккаунта, включая адрес электронной почты, имя и пароль.",
+            "UPDATED" => "Данные аккаунта обновлены"
         ],
 
         "TOOLS" => "Инструменты аккаунта",
@@ -44,19 +44,19 @@ return [
         "UNVERIFIED" => "Ваш аккаунт ещё не подтверждён. Проверьте вашу email почту, в том числе папку спам и следуйте инструкциям.",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"     => "Мы отправили на ваш email новую ссылку для активации {{email}}. Пожалуйста, проверьте папку \"Входящие\" и \"Спам\".",
-            "RESEND"            => "Повторно отправить письмо с подтверждением",
-            "COMPLETE"          => "Вы успешно подтвердили свой аккаунт. Теперь вы можете войти.",
-            "EMAIL"             => "Введите email, который вы использовали для регистрации, вам будет повторно отправлено письмо с подтверждением.",
-            "PAGE"              => "Повторно оправить письмо подтверждения на email для нового аккаунта.",
-            "SEND"              => "Проверка по электронной почте для аккаунта",
-            "TOKEN_NOT_FOUND"   => "Код подтверждения не действителен либо аккаунт уже подтверждён",
+            "NEW_LINK_SENT" => "Мы отправили на ваш email новую ссылку для активации {{email}}. Пожалуйста, проверьте папку \"Входящие\" и \"Спам\".",
+            "RESEND" => "Повторно отправить письмо с подтверждением",
+            "COMPLETE" => "Вы успешно подтвердили свой аккаунт. Теперь вы можете войти.",
+            "EMAIL" => "Введите email, который вы использовали для регистрации, вам будет повторно отправлено письмо с подтверждением.",
+            "PAGE" => "Повторно оправить письмо подтверждения на email для нового аккаунта.",
+            "SEND" => "Проверка по электронной почте для аккаунта",
+            "TOKEN_NOT_FOUND" => "Код подтверждения не действителен либо аккаунт уже подтверждён",
         ]
     ],
 
     "EMAIL" => [
-        "INVALID"               => "Нет не одного аккаунта с <strong> {{email}} </strong>.",
-        "IN_USE"                => "Email <strong>{{email}}</strong> уже используется.",
+        "INVALID" => "Нет не одного аккаунта с <strong> {{email}} </strong>.",
+        "IN_USE" => "Email <strong>{{email}}</strong> уже используется.",
         "VERIFICATION_REQUIRED" => "Email (указывайте верный - необходим для активации!)"
     ],
 
@@ -72,10 +72,10 @@ return [
         "INVALID" => "<strong>{{locale}}</strong> язык недопустим."
     ],
     "LOGIN" => [
-        "@TRANSLATION"      => "Вход",
-        "ALREADY_COMPLETE"  => "Вы уже выполнили вход!",
-        "SOCIAL"            => "Или войти через",
-        "REQUIRED"          => "Извините, Вы должны авторизоваться для доступа к этому ресурсу."
+        "@TRANSLATION" => "Вход",
+        "ALREADY_COMPLETE" => "Вы уже выполнили вход!",
+        "SOCIAL" => "Или войти через",
+        "REQUIRED" => "Извините, Вы должны авторизоваться для доступа к этому ресурсу."
     ],
     "LOGOUT" => "Выход",
 
@@ -85,99 +85,99 @@ return [
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"   => "Войдите в свой аккаунт {{site_name}}, или Зарегистрируйтесь.",
-            "SUBTITLE"      => "Зарегистрироваться или войти в существующий аккаунт.",
-            "TITLE"         => "Приступим!",
+            "DESCRIPTION" => "Войдите в свой аккаунт {{site_name}}, или Зарегистрируйтесь.",
+            "SUBTITLE" => "Зарегистрироваться или войти в существующий аккаунт.",
+            "TITLE" => "Приступим!",
         ]
     ],
 
     "PASSWORD" => [
         "@TRANSLATION" => "Пароль",
 
-        "BETWEEN"   => "Кол-во {{min}}-{{max}} символов",
+        "BETWEEN" => "Кол-во {{min}}-{{max}} символов",
 
-        "CONFIRM"               => "Подтверждение пароля",
-        "CONFIRM_CURRENT"       => "Пожалуйста, введите ваш текущий пароль",
-        "CONFIRM_NEW"           => "Подтвердите новый пароль",
-        "CONFIRM_NEW_EXPLAIN"   => "Повторно введите Ваш новый пароль",
-        "CONFIRM_NEW_HELP"      => "Требуется только при выборе нового пароля",
+        "CONFIRM" => "Подтверждение пароля",
+        "CONFIRM_CURRENT" => "Пожалуйста, введите ваш текущий пароль",
+        "CONFIRM_NEW" => "Подтвердите новый пароль",
+        "CONFIRM_NEW_EXPLAIN" => "Повторно введите Ваш новый пароль",
+        "CONFIRM_NEW_HELP" => "Требуется только при выборе нового пароля",
         "CREATE" => [
-            "@TRANSLATION"  => "Создать пароль",
-            "PAGE"          => "Выберите пароль для вашего аккаунта.",
-            "SET"           => "Установить пароль и войти"
+            "@TRANSLATION" => "Создать пароль",
+            "PAGE" => "Выберите пароль для вашего аккаунта.",
+            "SET" => "Установить пароль и войти"
         ],
-        "CURRENT"               => "Текущий пароль",
-        "CURRENT_EXPLAIN"       => "Для продолжения вы должны ввести текущий пароль",
+        "CURRENT" => "Текущий пароль",
+        "CURRENT_EXPLAIN" => "Для продолжения вы должны ввести текущий пароль",
 
         "FORGOTTEN" => "Забытый пароль?",
         "FORGET" => [
             "@TRANSLATION" => "Я забыл свой пароль",
 
-            "COULD_NOT_UPDATE"  => "Не удалось обновить пароль.",
-            "EMAIL"             => "Пожалуйста, введите адрес электронной почты, который Вы использовали при регистрации. Ссылка с инструкцией по сбросу пароля будет отправлена вам по электронной почте.",
-            "EMAIL_SEND"        => "Ссылка сброса пароля по Email",
-            "INVALID"           => "Этот запрос сброса пароля не может быть найден, или истек.  Пожалуйста, попробуйте <a href=\"{{url}}\"> повторно сбросить пароль<a>.",
-            "PAGE"              => "Получите ссылку для сброса пароля.",
-            "REQUEST_CANNED"    => "Запрос на сброс пароля отменен.",
-            "REQUEST_SENT"      => "Если email <strong>{{email}}</strong> существует в нашей системе у какого-либо аккаунта, ссылка на сброс пароля будет направлена на <strong>{{email}}</strong>."
+            "COULD_NOT_UPDATE" => "Не удалось обновить пароль.",
+            "EMAIL" => "Пожалуйста, введите адрес электронной почты, который Вы использовали при регистрации. Ссылка с инструкцией по сбросу пароля будет отправлена вам по электронной почте.",
+            "EMAIL_SEND" => "Ссылка сброса пароля по Email",
+            "INVALID" => "Этот запрос сброса пароля не может быть найден, или истек.  Пожалуйста, попробуйте <a href=\"{{url}}\"> повторно сбросить пароль<a>.",
+            "PAGE" => "Получите ссылку для сброса пароля.",
+            "REQUEST_CANNED" => "Запрос на сброс пароля отменен.",
+            "REQUEST_SENT" => "Если email <strong>{{email}}</strong> существует в нашей системе у какого-либо аккаунта, ссылка на сброс пароля будет направлена на <strong>{{email}}</strong>."
         ],
 
-        "HASH_FAILED"       => "Хэширование пароля не удалось. Пожалуйста, попробуйте другой пароль, либо свяжитесь с администратором сайта.",
-        "INVALID"           => "Текущий пароль не соответствует тому, который задан в системе.",
-        "NEW"               => "Новый пароль",
+        "HASH_FAILED" => "Хэширование пароля не удалось. Пожалуйста, попробуйте другой пароль, либо свяжитесь с администратором сайта.",
+        "INVALID" => "Текущий пароль не соответствует тому, который задан в системе.",
+        "NEW" => "Новый пароль",
         "NOTHING_TO_UPDATE" => "Невозможно обновить с тем же паролем",
 
         "RESET" => [
-            "@TRANSLATION"      => "Сбросить пароль",
-            "CHOOSE"            => "Пожалуйста, выберите новый пароль, чтобы продолжить.",
-            "PAGE"              => "Выберите новый пароль для вашего аккаунта.",
-            "SEND"              => "Задать новый пароль и войти"
+            "@TRANSLATION" => "Сбросить пароль",
+            "CHOOSE" => "Пожалуйста, выберите новый пароль, чтобы продолжить.",
+            "PAGE" => "Выберите новый пароль для вашего аккаунта.",
+            "SEND" => "Задать новый пароль и войти"
         ],
 
-        "UPDATED"           => "Пароль аккаунта обновлён"
+        "UPDATED" => "Пароль аккаунта обновлён"
     ],
 
-    "PROFILE"       => [
-        "SETTINGS"  => "Настройки профиля",
-        "UPDATED"   => "Настройки профиля обновлены"
+    "PROFILE" => [
+        "SETTINGS" => "Настройки профиля",
+        "UPDATED" => "Настройки профиля обновлены"
     ],
 
-    "RATE_LIMIT_EXCEEDED"       => "Превышен лимит попыток для этого действия. Вы должны подождать еще {{delay}} секунд, прежде чем вам вам будет разрешено сделать ещё попытку.",
+    "RATE_LIMIT_EXCEEDED" => "Превышен лимит попыток для этого действия. Вы должны подождать еще {{delay}} секунд, прежде чем вам вам будет разрешено сделать ещё попытку.",
 
-    "REGISTER"      => "Регистрация",
-    "REGISTER_ME"   => "Зарегистрируйте меня",
+    "REGISTER" => "Регистрация",
+    "REGISTER_ME" => "Зарегистрируйте меня",
     "REGISTRATION" => [
-        "BROKEN"            => "К сожалению, есть проблема с регистрации аккаунта. Свяжитесь с нами напрямую для получения помощи.",
-        "COMPLETE_TYPE1"    => "Вы успешно зарегистрировались. Теперь вы можете войти.",
-        "COMPLETE_TYPE2"    => "Вы успешно зарегистрировались. Ссылка для активации вашего аккаунта была отправлена на <strong>{{email}}</strong>. Вы сможете войти в систему только после активации аккаунта.",
-        "DISABLED"          => "Извините, регистрация аккаунта была отключена.",
-        "LOGOUT"            => "Извините, вы не можете зарегистрироваться когда уже авторизовались в системе. Сначала выйдите из системы.",
-        "WELCOME"           => "Быстрая и простая регистрация."
+        "BROKEN" => "К сожалению, есть проблема с регистрации аккаунта. Свяжитесь с нами напрямую для получения помощи.",
+        "COMPLETE_TYPE1" => "Вы успешно зарегистрировались. Теперь вы можете войти.",
+        "COMPLETE_TYPE2" => "Вы успешно зарегистрировались. Ссылка для активации вашего аккаунта была отправлена на <strong>{{email}}</strong>. Вы сможете войти в систему только после активации аккаунта.",
+        "DISABLED" => "Извините, регистрация аккаунта была отключена.",
+        "LOGOUT" => "Извините, вы не можете зарегистрироваться когда уже авторизовались в системе. Сначала выйдите из системы.",
+        "WELCOME" => "Быстрая и простая регистрация."
     ],
-    "REMEMBER_ME"               => "Запомнить",
-    "REMEMBER_ME_ON_COMPUTER"   => "Запомнить меня на этом компьютере (не рекомендуется для общедоступных компьютеров)",
+    "REMEMBER_ME" => "Запомнить",
+    "REMEMBER_ME_ON_COMPUTER" => "Запомнить меня на этом компьютере (не рекомендуется для общедоступных компьютеров)",
 
-    "SIGN_IN_HERE"          => "Уже есть аккаунт? <a href=\"{{url}}\"> войти.</a>",
-    "SIGNIN"                => "Вход",
-    "SIGNIN_OR_REGISTER"    => "Регистрация или вход",
-    "SIGNUP"                => "Вход",
+    "SIGN_IN_HERE" => "Уже есть аккаунт? <a href=\"{{url}}\"> войти.</a>",
+    "SIGNIN" => "Вход",
+    "SIGNIN_OR_REGISTER" => "Регистрация или вход",
+    "SIGNUP" => "Вход",
 
-    "TOS"           => "Пользовательское соглашение",
+    "TOS" => "Пользовательское соглашение",
     "TOS_AGREEMENT" => "Регистрируя аккаунт на {{site_title}}, вы принимаете <a {{link_attributes | raw}}> условия и положения</a>.",
-    "TOS_FOR"       => "Правила и условия для {{title}}",
+    "TOS_FOR" => "Правила и условия для {{title}}",
 
     "USERNAME" => [
         "@TRANSLATION" => "Пользователь",
 
-        "CHOOSE"        => "Выберите имя пользователя",
-        "INVALID"       => "Недопустимое имя пользователя",
-        "IN_USE"        => "<strong>{{user_name}}</strong> имя пользователя уже используется.",
+        "CHOOSE" => "Выберите имя пользователя",
+        "INVALID" => "Недопустимое имя пользователя",
+        "IN_USE" => "<strong>{{user_name}}</strong> имя пользователя уже используется.",
         "NOT_AVAILABLE" => "Имя пользователя <strong>{{user_name}}</strong> не доступно. Выберите другое имя или нажмите кнопку «предложить»."
     ],
 
-    "USER_ID_INVALID"       => "ID запрашиваемого пользователя не существует.",
+    "USER_ID_INVALID" => "ID запрашиваемого пользователя не существует.",
     "USER_OR_EMAIL_INVALID" => "Имя пользователя или email не верный.",
-    "USER_OR_PASS_INVALID"  => "Пользователь не найден или пароль является недействительным.",
+    "USER_OR_PASS_INVALID" => "Пользователь не найден или пароль является недействительным.",
 
     "WELCOME" => "Добро пожаловать, {{first_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/ru_RU/validate.php b/main/app/sprinkles/account/locale/ru_RU/validate.php
index 8ede5d8..4d39bbe 100644
--- a/main/app/sprinkles/account/locale/ru_RU/validate.php
+++ b/main/app/sprinkles/account/locale/ru_RU/validate.php
@@ -12,7 +12,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "Пароли не совпадают.",
         "USERNAME" => "Имя может состоять только из строчных букв, цифр, '.', '-' и «_»."
     ]
diff --git a/main/app/sprinkles/account/locale/th_TH/messages.php b/main/app/sprinkles/account/locale/th_TH/messages.php
index 012c7f4..d937de1 100644
--- a/main/app/sprinkles/account/locale/th_TH/messages.php
+++ b/main/app/sprinkles/account/locale/th_TH/messages.php
@@ -24,16 +24,16 @@ return [
         "INVALID" => "ไม่พบบัญชีนี้ มันอาจถูกลบไปแล้ว กรุณาติดต่อเราสำหรับข้อมูลเพิ่มเติม",
 
         "MASTER_NOT_EXISTS" => "คุณไม่สามารถสมัครสมาชิกได้จนกว่าจะสร้างบัญชีหลัก!",
-        "MY"                => "บัญชีของฉัน",
+        "MY" => "บัญชีของฉัน",
 
-        "SESSION_COMPROMISED"       => "เซสชันของคุณถูกลักลอบใช้ คุณควรจะออกจากระบบบนอุปกรณ์ทั้งหมดแล้วกลับเข้าสู่ระบบและตรวจสอบให้แน่ใจว่าไม่มีการแก้ไขข้อมูลของคุณ",
+        "SESSION_COMPROMISED" => "เซสชันของคุณถูกลักลอบใช้ คุณควรจะออกจากระบบบนอุปกรณ์ทั้งหมดแล้วกลับเข้าสู่ระบบและตรวจสอบให้แน่ใจว่าไม่มีการแก้ไขข้อมูลของคุณ",
         "SESSION_COMPROMISED_TITLE" => "บัญชีของคุณอาจถูกบุกรุก",
-        "SESSION_EXPIRED"       => "เซสชันของคุณหมดอายุ กรุณาเข้าสู่ระบบอีกครั้ง",
+        "SESSION_EXPIRED" => "เซสชันของคุณหมดอายุ กรุณาเข้าสู่ระบบอีกครั้ง",
 
         "SETTINGS" => [
-            "@TRANSLATION"  => "การตั้งค่าบัญชี",
-            "DESCRIPTION"   => "ปรับปรุงการตั้งค่าบัญชีของคุณ รวมไปถึงอีเมล ชื่อ และรหัสผ่าน",
-            "UPDATED"       => "ปรับปรุงการตั้งค่าบัญชีของคุณแล้ว"
+            "@TRANSLATION" => "การตั้งค่าบัญชี",
+            "DESCRIPTION" => "ปรับปรุงการตั้งค่าบัญชีของคุณ รวมไปถึงอีเมล ชื่อ และรหัสผ่าน",
+            "UPDATED" => "ปรับปรุงการตั้งค่าบัญชีของคุณแล้ว"
         ],
 
         "TOOLS" => "เครื่องมือบัญชี",
@@ -41,19 +41,19 @@ return [
         "UNVERIFIED" => "บัญชีของคุณยังไม่ได้รับการยืนยัน กรุณาตรวจสอบกล่องอีเมลและจดหมายขยะของคุณสำหรับขั้นตอนการเปิดใช้งานบัญชี",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"     => "เราได้ส่งลิงก์สำหรับการยืนยันใหม่ไปยังอีเมล {{email}} กรุณาตรวจสอบอีเมลนี้ในกล่องอีเมลและจดหมายขยะของคุณ",
-            "RESEND"            => "ส่งอีเมลยืนยันอีกครั้ง",
-            "COMPLETE"          => "คุณได้ยืนยันอีเมลของคุณเรียบร้อยแล้ว คุณสามารถเข้าสู่ระบบได้ทันที",
-            "EMAIL"             => "กรุณากรอกอีเมลที่คุณได้ใช้สมัครไว้แล้วอีเมลยืนยันจะถูกส่งไปให้ใหม่",
-            "PAGE"              => "ส่งอีเมลยืนยันสำหรับบัญชีของฉันใหม่",
-            "SEND"              => "ส่งอีเมลยืนยันให้บัญชีของฉัน",
-            "TOKEN_NOT_FOUND"   => "ไม่พบโทเคนยืนยันอีเมล / บัญชีนี้ได้ยืนยันแล้ว",
+            "NEW_LINK_SENT" => "เราได้ส่งลิงก์สำหรับการยืนยันใหม่ไปยังอีเมล {{email}} กรุณาตรวจสอบอีเมลนี้ในกล่องอีเมลและจดหมายขยะของคุณ",
+            "RESEND" => "ส่งอีเมลยืนยันอีกครั้ง",
+            "COMPLETE" => "คุณได้ยืนยันอีเมลของคุณเรียบร้อยแล้ว คุณสามารถเข้าสู่ระบบได้ทันที",
+            "EMAIL" => "กรุณากรอกอีเมลที่คุณได้ใช้สมัครไว้แล้วอีเมลยืนยันจะถูกส่งไปให้ใหม่",
+            "PAGE" => "ส่งอีเมลยืนยันสำหรับบัญชีของฉันใหม่",
+            "SEND" => "ส่งอีเมลยืนยันให้บัญชีของฉัน",
+            "TOKEN_NOT_FOUND" => "ไม่พบโทเคนยืนยันอีเมล / บัญชีนี้ได้ยืนยันแล้ว",
         ]
     ],
 
     "EMAIL" => [
-        "INVALID"   => "อีเมล <strong>{{email}}</strong> ไม่มีอยู่จริง",
-        "IN_USE"    => "อีเมล <strong>{{email}}</strong> ได้ถูกใช้งานแล้ว"
+        "INVALID" => "อีเมล <strong>{{email}}</strong> ไม่มีอยู่จริง",
+        "IN_USE" => "อีเมล <strong>{{email}}</strong> ได้ถูกใช้งานแล้ว"
     ],
 
     "FIRST_NAME" => "ชื่อจริง",
@@ -67,9 +67,9 @@ return [
     "LOGIN" => [
         "@TRANSLATION" => "เข้าสู่ะระบบ",
 
-        "ALREADY_COMPLETE"  => "คุณได้เข้าสู่ระบบอยู่แล้ว!",
-        "SOCIAL"            => "หรือเข้าสู่ระบบด้วย",
-        "REQUIRED"          => "ขออภัย คุณจะต้องเข้าสู่ระบบเพื่อเข้าถึงส่วนนี้"
+        "ALREADY_COMPLETE" => "คุณได้เข้าสู่ระบบอยู่แล้ว!",
+        "SOCIAL" => "หรือเข้าสู่ระบบด้วย",
+        "REQUIRED" => "ขออภัย คุณจะต้องเข้าสู่ระบบเพื่อเข้าถึงส่วนนี้"
     ],
 
     "LOGOUT" => "ออกจากระบบ",
@@ -78,87 +78,87 @@ return [
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"   => "เข้าสู่ระบบไปยังบัญชี {{site_name}} หรือสมัครสมาชิกสำหรับบัญชีใหม่",
-            "SUBTITLE"      => "สมัครสมาชิกฟรี หรือเข้าสู่ระบบด้วยบัญชีที่มีอยู่",
-            "TITLE"         => "มาเริ่มกันเลย!",
+            "DESCRIPTION" => "เข้าสู่ระบบไปยังบัญชี {{site_name}} หรือสมัครสมาชิกสำหรับบัญชีใหม่",
+            "SUBTITLE" => "สมัครสมาชิกฟรี หรือเข้าสู่ระบบด้วยบัญชีที่มีอยู่",
+            "TITLE" => "มาเริ่มกันเลย!",
         ]
     ],
 
     "PASSWORD" => [
         "@TRANSLATION" => "รหัสผ่าน",
 
-        "BETWEEN"   => "ระหว่าง {{min}}-{{max}} ตัวอักษร",
+        "BETWEEN" => "ระหว่าง {{min}}-{{max}} ตัวอักษร",
 
-        "CONFIRM"               => "ยืนยันรหัสผ่าน",
-        "CONFIRM_CURRENT"       => "กรุณายืนยันรหัสผ่านปัจจุบันของคุณ",
-        "CONFIRM_NEW"           => "ยืนยันรหัสผ่านใหม่",
-        "CONFIRM_NEW_EXPLAIN"   => "กรอกรหัสผ่านใหม่ของคุณอีกครั้ง",
-        "CONFIRM_NEW_HELP"      => "กรอกเฉพาะเมื่อคุณต้องการตั้งรหัสผ่านใหม่",
-        "CURRENT"               => "รหัสผ่านปัจจุบัน",
-        "CURRENT_EXPLAIN"       => "คุณจะต้องยืนยันรหัสผ่านปัจจุบันเพื่อแก้ไขข้อมูล",
+        "CONFIRM" => "ยืนยันรหัสผ่าน",
+        "CONFIRM_CURRENT" => "กรุณายืนยันรหัสผ่านปัจจุบันของคุณ",
+        "CONFIRM_NEW" => "ยืนยันรหัสผ่านใหม่",
+        "CONFIRM_NEW_EXPLAIN" => "กรอกรหัสผ่านใหม่ของคุณอีกครั้ง",
+        "CONFIRM_NEW_HELP" => "กรอกเฉพาะเมื่อคุณต้องการตั้งรหัสผ่านใหม่",
+        "CURRENT" => "รหัสผ่านปัจจุบัน",
+        "CURRENT_EXPLAIN" => "คุณจะต้องยืนยันรหัสผ่านปัจจุบันเพื่อแก้ไขข้อมูล",
 
         "FORGOTTEN" => "ลืมรหัสผ่าน",
         "FORGET" => [
             "@TRANSLATION" => "ฉันลืมรหัสผ่านของฉัน",
 
-            "COULD_NOT_UPDATE"  => "ไม่สามารถปรับปรุงรหัสผ่าน",
-            "EMAIL"             => "กรุณากรอกที่อยู่อีเมลที่คุณเคยใช้เข้าสู่ระบบ ลิงก์ขั้นตอนการรีเซ็ตรหัสผ่านของคุณจะถูกส่งไปให้คุณ",
-            "EMAIL_SEND"        => "ลิงก์รีเซ็ตรหัสผ่านจากอีเมล",
-            "INVALID"           => "ขอรีเซ็ตรหัสผ่านนี้ไม่มีอยู่ หรือหมดอายุไปแล้ว กรุณาลอง <a href=\"{{url}}\">ส่งคำขอของคุณอีกครั้ง<a>",
-            "PAGE"              => "รับลิงก์สำหรับการรีเซ็ตรหัสผ่านของคุณ",
-            "REQUEST_CANNED"    => "คำขอลืมรหัสผ่านได้ถูกยกเลิก",
-            "REQUEST_SENT"      => "หากอีเมล <strong>{{email}}</strong> ตรงกับบัญชีในระบบของเราลิงก์การรีเซ็ตรหัสผ่านจะถูกส่งไปที่ <strong>{{email}}</strong>"
+            "COULD_NOT_UPDATE" => "ไม่สามารถปรับปรุงรหัสผ่าน",
+            "EMAIL" => "กรุณากรอกที่อยู่อีเมลที่คุณเคยใช้เข้าสู่ระบบ ลิงก์ขั้นตอนการรีเซ็ตรหัสผ่านของคุณจะถูกส่งไปให้คุณ",
+            "EMAIL_SEND" => "ลิงก์รีเซ็ตรหัสผ่านจากอีเมล",
+            "INVALID" => "ขอรีเซ็ตรหัสผ่านนี้ไม่มีอยู่ หรือหมดอายุไปแล้ว กรุณาลอง <a href=\"{{url}}\">ส่งคำขอของคุณอีกครั้ง<a>",
+            "PAGE" => "รับลิงก์สำหรับการรีเซ็ตรหัสผ่านของคุณ",
+            "REQUEST_CANNED" => "คำขอลืมรหัสผ่านได้ถูกยกเลิก",
+            "REQUEST_SENT" => "หากอีเมล <strong>{{email}}</strong> ตรงกับบัญชีในระบบของเราลิงก์การรีเซ็ตรหัสผ่านจะถูกส่งไปที่ <strong>{{email}}</strong>"
         ],
 
         "RESET" => [
-            "@TRANSLATION"      => "รีเซ็ตรหัสผ่าน",
-            "CHOOSE"            => "กรุณาเลือกรหัสผ่านใหม่เพื่อดำเนินการต่อ",
-            "PAGE"              => "เลือกรหัสผ่านใหม่สำหรับบัญชีของคุณ",
-            "SEND"              => "ตั้งรหัสผ่านใหม่และเข้าสู่ระบบ"
+            "@TRANSLATION" => "รีเซ็ตรหัสผ่าน",
+            "CHOOSE" => "กรุณาเลือกรหัสผ่านใหม่เพื่อดำเนินการต่อ",
+            "PAGE" => "เลือกรหัสผ่านใหม่สำหรับบัญชีของคุณ",
+            "SEND" => "ตั้งรหัสผ่านใหม่และเข้าสู่ระบบ"
         ],
 
-        "HASH_FAILED"       => "เข้ารหัสรหัสผ่านล้มเหลว กรุณาติดต่อผู้ดูแลระบบของเว็บไซต์",
-        "INVALID"           => "รหัสผ่านปัจจุบันไม่ตรงกับรหัสผ่านที่เราบันทึกไว้",
-        "NEW"               => "รหัสผ่านใหม่",
+        "HASH_FAILED" => "เข้ารหัสรหัสผ่านล้มเหลว กรุณาติดต่อผู้ดูแลระบบของเว็บไซต์",
+        "INVALID" => "รหัสผ่านปัจจุบันไม่ตรงกับรหัสผ่านที่เราบันทึกไว้",
+        "NEW" => "รหัสผ่านใหม่",
         "NOTHING_TO_UPDATE" => "คุณไม่สามารถปรังปรุงด้วยรหัสผ่านเดียวกัน",
-        "UPDATED"           => "ปรังปรุงรหัสผ่านของบัญชีแล้ว"
+        "UPDATED" => "ปรังปรุงรหัสผ่านของบัญชีแล้ว"
     ],
 
-    "REGISTER"      => "สมัครสมาชิก",
-    "REGISTER_ME"   => "ให้ฉันสมัครสมาชิกด้วย",
+    "REGISTER" => "สมัครสมาชิก",
+    "REGISTER_ME" => "ให้ฉันสมัครสมาชิกด้วย",
 
     "REGISTRATION" => [
-        "BROKEN"            => "เราขออภัย มันมีปัญหาในการดำเนินการสมัครสมาชิกของเรา กรุณาติดต่อเราโดยตรงเพื่อขอความช่วยเหลือ",
-        "COMPLETE_TYPE1"    => "คุณได้สมัครสมาชิกเรียบร้อยแล้ว คุณสามารถเข้าสู่ระบบได้ทันที",
-        "COMPLETE_TYPE2"    => "คุณได้สมัครสมาชิกเรียบร้อยแล้ว คุณจะได้รับอีเมลยืนยันที่มีลิงก์สำหรับเปิดใช้งานบัญชีของคุณอยู่ คุณจะไม่สามารถเข้าสู่ระบบจนกว่าคุณจะยืนยันอีเมลแล้ว",
-        "DISABLED"          => "เราขออภัย ระบบสมัครสมาชิกได้ถูกปิดไว้",
-        "LOGOUT"            => "เราขออภัย คุณไม่สามารถสมัครสมาชิกขณะที่เข้าสู่ระบบอยู่ กรุณาออกจากระบบก่อน",
-        "WELCOME"           => "การสมัครสมาชิกนั้นรวดเร็ว และง่ายดาย"
+        "BROKEN" => "เราขออภัย มันมีปัญหาในการดำเนินการสมัครสมาชิกของเรา กรุณาติดต่อเราโดยตรงเพื่อขอความช่วยเหลือ",
+        "COMPLETE_TYPE1" => "คุณได้สมัครสมาชิกเรียบร้อยแล้ว คุณสามารถเข้าสู่ระบบได้ทันที",
+        "COMPLETE_TYPE2" => "คุณได้สมัครสมาชิกเรียบร้อยแล้ว คุณจะได้รับอีเมลยืนยันที่มีลิงก์สำหรับเปิดใช้งานบัญชีของคุณอยู่ คุณจะไม่สามารถเข้าสู่ระบบจนกว่าคุณจะยืนยันอีเมลแล้ว",
+        "DISABLED" => "เราขออภัย ระบบสมัครสมาชิกได้ถูกปิดไว้",
+        "LOGOUT" => "เราขออภัย คุณไม่สามารถสมัครสมาชิกขณะที่เข้าสู่ระบบอยู่ กรุณาออกจากระบบก่อน",
+        "WELCOME" => "การสมัครสมาชิกนั้นรวดเร็ว และง่ายดาย"
     ],
 
-    "RATE_LIMIT_EXCEEDED"       => "ถึงขีดจำกัดสำหรับการกระทำนี้แล้ว คุณจะต้องรออีก {{delay}} วินาที ก่อนที่คุณจะได้รับอนุญาตให้ลองใหม่อีกครั้ง",
-    "REMEMBER_ME"               => "จำฉันไว้ในระบบ!",
-    "REMEMBER_ME_ON_COMPUTER"   => "จำฉันไว้ในระบบบนคอมพิวเตอร์นี้ (ไม่แนะนำสำหรับคอมพิวเตอร์สาธารณะ)",
+    "RATE_LIMIT_EXCEEDED" => "ถึงขีดจำกัดสำหรับการกระทำนี้แล้ว คุณจะต้องรออีก {{delay}} วินาที ก่อนที่คุณจะได้รับอนุญาตให้ลองใหม่อีกครั้ง",
+    "REMEMBER_ME" => "จำฉันไว้ในระบบ!",
+    "REMEMBER_ME_ON_COMPUTER" => "จำฉันไว้ในระบบบนคอมพิวเตอร์นี้ (ไม่แนะนำสำหรับคอมพิวเตอร์สาธารณะ)",
 
-    "SIGNIN"                => "เข้าสู่ะระบบ",
-    "SIGNIN_OR_REGISTER"    => "เข้าสู่ระบบหรือสมัครสมาชิก",
-    "SIGNUP"                => "สมัครสมาชิก",
+    "SIGNIN" => "เข้าสู่ะระบบ",
+    "SIGNIN_OR_REGISTER" => "เข้าสู่ระบบหรือสมัครสมาชิก",
+    "SIGNUP" => "สมัครสมาชิก",
 
-    "TOS"           => "ข้อตกลงและเงื่อนไข",
+    "TOS" => "ข้อตกลงและเงื่อนไข",
     "TOS_AGREEMENT" => "ในการสมัครสมาชิกกับ {{site_title}} หมายถึงคุณยอมรับ <a {{link_attributes}}>ข้อตกลงและเงื่อนไข</a> แล้ว",
-    "TOS_FOR"       => "ข้อตกลงและเงื่อนไขสำหรับ {{title}}",
+    "TOS_FOR" => "ข้อตกลงและเงื่อนไขสำหรับ {{title}}",
 
     "USERNAME" => [
         "@TRANSLATION" => "ชื่อผู้ใช้",
 
-        "CHOOSE"  => "เลือกชื่อผู้ใช้ที่เป็นเป็นเอกลักษณ์",
+        "CHOOSE" => "เลือกชื่อผู้ใช้ที่เป็นเป็นเอกลักษณ์",
         "INVALID" => "ชื่อผู้ใช้ไม่ถูกต้อง",
-        "IN_USE"  => "ชื่อผู้ใช้ <strong>{{user_name}}</strong> ถูกใช้งานแล้ว"
+        "IN_USE" => "ชื่อผู้ใช้ <strong>{{user_name}}</strong> ถูกใช้งานแล้ว"
     ],
 
-    "USER_ID_INVALID"       => "ไม่พบหมายเลขผู้ใช้ที่ร้องขอมา",
+    "USER_ID_INVALID" => "ไม่พบหมายเลขผู้ใช้ที่ร้องขอมา",
     "USER_OR_EMAIL_INVALID" => "ชื่อผู้ใช้หรือที่อยู่อีเมลไม่ถูกต้อง",
-    "USER_OR_PASS_INVALID"  => "ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง",
+    "USER_OR_PASS_INVALID" => "ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง",
 
     "WELCOME" => "ยินดีต้อนรับ {{first_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/th_TH/validate.php b/main/app/sprinkles/account/locale/th_TH/validate.php
index 6540aa2..14a7adb 100644
--- a/main/app/sprinkles/account/locale/th_TH/validate.php
+++ b/main/app/sprinkles/account/locale/th_TH/validate.php
@@ -12,7 +12,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "รหัสผ่านและรหัสผ่านยืนยันของคุณจะต้องตรงกัน"
     ]
 ];
diff --git a/main/app/sprinkles/account/locale/tr/messages.php b/main/app/sprinkles/account/locale/tr/messages.php
index 5213490..a18bf99 100644
--- a/main/app/sprinkles/account/locale/tr/messages.php
+++ b/main/app/sprinkles/account/locale/tr/messages.php
@@ -10,7 +10,7 @@
  * @package userfrosting\i18n\tr
  * @author Dumblledore
  */
- 
+
 return [
     "ACCOUNT" => [
         "@TRANSLATION" => "Hesap",
@@ -24,19 +24,19 @@ return [
         "INVALID" => "Bu hesap bulunamadı. Silinmiş olabilir. Daha çok bilgi için bizimle iletişime geçin.",
 
         "MASTER_NOT_EXISTS" => "Ana hesap oluşturuluncaya kadar bir hesap oluşturamazsın!",
-        "MY"                => "Hesabım",
+        "MY" => "Hesabım",
 
         "SESSION_COMPROMISED" => [
-            "@TRANSLATION"  => "Oturumunuz tehlikeye atıldı. Tüm cihazlardan çıkmanız, daha sonra giriş yapmanız ve bilgilerinizin değiştirilmediğini kontrol etmeniz gerekir.",
-            "TITLE"         => "Hesabınız tehlikeye atılmış olabilir",
-            "TEXT"          => "Birisi bu sayfayı ele geçirmek için giriş verilerinizi kullanmış olabilir. Güvenliğiniz için tüm oturumlar günlüğe kaydedildi. Lütfen  <a href=\"{{url}}\">giriş yapın</a>ve şüpheli hareketler için hesabınızı kontrol edin. Ayrıca şifrenizi değiştirmek isteyebilirsiniz."
+            "@TRANSLATION" => "Oturumunuz tehlikeye atıldı. Tüm cihazlardan çıkmanız, daha sonra giriş yapmanız ve bilgilerinizin değiştirilmediğini kontrol etmeniz gerekir.",
+            "TITLE" => "Hesabınız tehlikeye atılmış olabilir",
+            "TEXT" => "Birisi bu sayfayı ele geçirmek için giriş verilerinizi kullanmış olabilir. Güvenliğiniz için tüm oturumlar günlüğe kaydedildi. Lütfen  <a href=\"{{url}}\">giriş yapın</a>ve şüpheli hareketler için hesabınızı kontrol edin. Ayrıca şifrenizi değiştirmek isteyebilirsiniz."
         ],
-        "SESSION_EXPIRED"       => "Oturumunuz sona erdi. Lütfen tekrar oturum açın.",
+        "SESSION_EXPIRED" => "Oturumunuz sona erdi. Lütfen tekrar oturum açın.",
 
         "SETTINGS" => [
-            "@TRANSLATION"  => "Hesap ayarları",
-            "DESCRIPTION"   => "E-posta, isim ve parolanız da dahil olmak üzere hesap ayarlarınızı güncelleyin.",
-            "UPDATED"       => "Hesap ayarları güncellendi"
+            "@TRANSLATION" => "Hesap ayarları",
+            "DESCRIPTION" => "E-posta, isim ve parolanız da dahil olmak üzere hesap ayarlarınızı güncelleyin.",
+            "UPDATED" => "Hesap ayarları güncellendi"
         ],
 
         "TOOLS" => "Hesap araçları",
@@ -44,19 +44,19 @@ return [
         "UNVERIFIED" => "Hesap henüz onaylanmadı. Hesap etkinleştirme talimatları için e-postalarınızı ve spam klasörünüzü kontrol edin.",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"     => "{{email}} için yeni bir doğrulama bağlantısı e-posta ile gönderildi. Lütfen bu e-postanın gelen kutusunu ve spam klasörlerini kontrol edin.",
-            "RESEND"            => "Doğrulama e-postasını tekrar gönder",
-            "COMPLETE"          => "Hesabınızı başarıyla doğruladınız. Şimdi giriş yapabilirsiniz.",
-            "EMAIL"             => "Kaydolmak için kullandığınız e-posta adresinizi giriniz, ve doğrulama e-postanızı tekrar gönderin.",
-            "PAGE"              => "Yeni hesabınız için doğrulama e-postasını tekrar gönder.",
-            "SEND"              => "Hesabım için doğrulama bağlantısını e-posta ile gönder",
-            "TOKEN_NOT_FOUND"   => "Doğrulama belirteci bulunumadı / Hesap zaten doğrulandı",
+            "NEW_LINK_SENT" => "{{email}} için yeni bir doğrulama bağlantısı e-posta ile gönderildi. Lütfen bu e-postanın gelen kutusunu ve spam klasörlerini kontrol edin.",
+            "RESEND" => "Doğrulama e-postasını tekrar gönder",
+            "COMPLETE" => "Hesabınızı başarıyla doğruladınız. Şimdi giriş yapabilirsiniz.",
+            "EMAIL" => "Kaydolmak için kullandığınız e-posta adresinizi giriniz, ve doğrulama e-postanızı tekrar gönderin.",
+            "PAGE" => "Yeni hesabınız için doğrulama e-postasını tekrar gönder.",
+            "SEND" => "Hesabım için doğrulama bağlantısını e-posta ile gönder",
+            "TOKEN_NOT_FOUND" => "Doğrulama belirteci bulunumadı / Hesap zaten doğrulandı",
         ]
     ],
 
     "EMAIL" => [
-        "INVALID"               => "<strong>{{email}}</strong> için hesap yoktur.",
-        "IN_USE"                => "E-posta <strong>{{email}}</strong> zaten kullanılıyor.",
+        "INVALID" => "<strong>{{email}}</strong> için hesap yoktur.",
+        "IN_USE" => "E-posta <strong>{{email}}</strong> zaten kullanılıyor.",
         "VERIFICATION_REQUIRED" => "E-posta (doğrulama gerekli - gerçek bir adres kullanın!)"
     ],
 
@@ -72,10 +72,10 @@ return [
         "INVALID" => "<strong>{{locale}}</strong> geçersiz bir yerel."
     ],
     "LOGIN" => [
-        "@TRANSLATION"      => "Oturum Aç",
-        "ALREADY_COMPLETE"  => "Zaten oturum açtınız!",
-        "SOCIAL"            => "Veya şununla oturum aç",
-        "REQUIRED"          => "Üzgünüm, bu sayfaya ulaşmak için oturum açmalısın."
+        "@TRANSLATION" => "Oturum Aç",
+        "ALREADY_COMPLETE" => "Zaten oturum açtınız!",
+        "SOCIAL" => "Veya şununla oturum aç",
+        "REQUIRED" => "Üzgünüm, bu sayfaya ulaşmak için oturum açmalısın."
     ],
     "LOGOUT" => "Oturumu kapat",
 
@@ -85,99 +85,99 @@ return [
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"   => "{{site_name}} hesabınız ile giriş yapın ya da yeni bir hesap oluşturun.",
-            "SUBTITLE"      => "Ücretsiz üye ol veya mevcut bir hesap ile giriş yapın.",
-            "TITLE"         => "Hadi başlayalım!",
+            "DESCRIPTION" => "{{site_name}} hesabınız ile giriş yapın ya da yeni bir hesap oluşturun.",
+            "SUBTITLE" => "Ücretsiz üye ol veya mevcut bir hesap ile giriş yapın.",
+            "TITLE" => "Hadi başlayalım!",
         ]
     ],
 
     "PASSWORD" => [
         "@TRANSLATION" => "Parola",
 
-        "BETWEEN"   => "{{min}}-{{max}} karakterler arasında",
+        "BETWEEN" => "{{min}}-{{max}} karakterler arasında",
 
-        "CONFIRM"               => "Şifreyi onayla",
-        "CONFIRM_CURRENT"       => "Lütfen şuanki parolanızı giriniz",
-        "CONFIRM_NEW"           => "Yeni parolayı onayla",
-        "CONFIRM_NEW_EXPLAIN"   => "Yeni parolayı tekrar gir",
-        "CONFIRM_NEW_HELP"      => "Sadece yeni bir şifre seçerseniz gerekli",
+        "CONFIRM" => "Şifreyi onayla",
+        "CONFIRM_CURRENT" => "Lütfen şuanki parolanızı giriniz",
+        "CONFIRM_NEW" => "Yeni parolayı onayla",
+        "CONFIRM_NEW_EXPLAIN" => "Yeni parolayı tekrar gir",
+        "CONFIRM_NEW_HELP" => "Sadece yeni bir şifre seçerseniz gerekli",
         "CREATE" => [
-            "@TRANSLATION"  => "Parola Oluştur",
-            "PAGE"          => "Yeni hesabınız için bir şifre belirleyin.",
-            "SET"           => "Parolayı Ayarla ve Giriş Yap"
+            "@TRANSLATION" => "Parola Oluştur",
+            "PAGE" => "Yeni hesabınız için bir şifre belirleyin.",
+            "SET" => "Parolayı Ayarla ve Giriş Yap"
         ],
-        "CURRENT"               => "Şimdiki Parola",
-        "CURRENT_EXPLAIN"       => "Değişiklikler için şimdiki parolanız ile onaylamalısınız",
+        "CURRENT" => "Şimdiki Parola",
+        "CURRENT_EXPLAIN" => "Değişiklikler için şimdiki parolanız ile onaylamalısınız",
 
         "FORGOTTEN" => "Unutulan Şifre",
         "FORGET" => [
             "@TRANSLATION" => "Şifremi unuttum",
 
-            "COULD_NOT_UPDATE"  => "Şifre güncellenemedi.",
-            "EMAIL"             => "Lütfen kaydolmak için kullandığınız e-posta adresini giriniz. Şifrenizi sıfırlama talimatlarıyla bir bir bağlantı e-postanıza gönderilecektir.",
-            "EMAIL_SEND"        => "E-posta şifre sıfırlama bağlantısı",
-            "INVALID"           => "Bu şifre sıfırlama isteği bulunamadı ya da süresi bitmiş. Lütfen <a href=\"{{url}}\">isteğinizi yeniden göndermeyi<a>deneyin.",
-            "PAGE"              => "Şifrenizi sıfırlamak için bir bağlantı oluşturun.",
-            "REQUEST_CANNED"    => "Kayıp parola isteği iptal edildi.",
-            "REQUEST_SENT"      => "Eğer e-posta<strong>{{email}}</strong> sistemdeki bir hesap ile eşleşirse, bir şifre yenileme bağlantısı<strong>{{email}}</strong> gönderilir."
+            "COULD_NOT_UPDATE" => "Şifre güncellenemedi.",
+            "EMAIL" => "Lütfen kaydolmak için kullandığınız e-posta adresini giriniz. Şifrenizi sıfırlama talimatlarıyla bir bir bağlantı e-postanıza gönderilecektir.",
+            "EMAIL_SEND" => "E-posta şifre sıfırlama bağlantısı",
+            "INVALID" => "Bu şifre sıfırlama isteği bulunamadı ya da süresi bitmiş. Lütfen <a href=\"{{url}}\">isteğinizi yeniden göndermeyi<a>deneyin.",
+            "PAGE" => "Şifrenizi sıfırlamak için bir bağlantı oluşturun.",
+            "REQUEST_CANNED" => "Kayıp parola isteği iptal edildi.",
+            "REQUEST_SENT" => "Eğer e-posta<strong>{{email}}</strong> sistemdeki bir hesap ile eşleşirse, bir şifre yenileme bağlantısı<strong>{{email}}</strong> gönderilir."
         ],
 
-        "HASH_FAILED"       => "Parola karma başarısız oldu. Lütfen bir site yöneticisiyle iletişime geçin.",
-        "INVALID"           => "Şimdiki şifre kayıt edilen şifre ile eşleşmiyor",
-        "NEW"               => "Yeni Şifre",
+        "HASH_FAILED" => "Parola karma başarısız oldu. Lütfen bir site yöneticisiyle iletişime geçin.",
+        "INVALID" => "Şimdiki şifre kayıt edilen şifre ile eşleşmiyor",
+        "NEW" => "Yeni Şifre",
         "NOTHING_TO_UPDATE" => "Aynı şifre ile güncelleyemezsiniz",
 
         "RESET" => [
-            "@TRANSLATION"      => "Şifre sıfırlama",
-            "CHOOSE"            => "Lütfen devam etmek için yeni bir şifre belirleyiniz.",
-            "PAGE"              => "Hesabınız için yeni bir şifre belirleyiniz.",
-            "SEND"              => "Yeni şifre ayarla ve giriş yap"
+            "@TRANSLATION" => "Şifre sıfırlama",
+            "CHOOSE" => "Lütfen devam etmek için yeni bir şifre belirleyiniz.",
+            "PAGE" => "Hesabınız için yeni bir şifre belirleyiniz.",
+            "SEND" => "Yeni şifre ayarla ve giriş yap"
         ],
 
-        "UPDATED"           => "Hesap şifresi güncellendi"
+        "UPDATED" => "Hesap şifresi güncellendi"
     ],
 
-    "PROFILE"       => [
-        "SETTINGS"  => "Profil ayarları",
-        "UPDATED"   => "Profil ayarları güncellendi"
+    "PROFILE" => [
+        "SETTINGS" => "Profil ayarları",
+        "UPDATED" => "Profil ayarları güncellendi"
     ],
 
-    "RATE_LIMIT_EXCEEDED"       => "Bu işlem için belirlenen son oran aşıldı. Başka bir deneme yapmanıza izin verilene kadar {{delay}} bir süre beklemelisiniz.",
+    "RATE_LIMIT_EXCEEDED" => "Bu işlem için belirlenen son oran aşıldı. Başka bir deneme yapmanıza izin verilene kadar {{delay}} bir süre beklemelisiniz.",
 
-    "REGISTER"      => "Kaydol",
-    "REGISTER_ME"   => "Beni kaydet",
+    "REGISTER" => "Kaydol",
+    "REGISTER_ME" => "Beni kaydet",
     "REGISTRATION" => [
-        "BROKEN"            => "Üzgünüz, hesap kayıt işlemimizde bir sorun var. Lütfen destek almak için doğrudan bizimle iletişime geçin.",
-        "COMPLETE_TYPE1"    => "Kaydınız başarıyla tamamlandı. Şimdi giriş yapabilirsiniz.",
-        "COMPLETE_TYPE2"    => "Kaydınız başarıyla tamamlandı. Hesabınızı aktifleştirmek için bir bağlantı gönderildi<strong>{{email}}</strong>. Bu adımı tamamlayana kadar oturum açamazsınız.",
-        "DISABLED"          => "Üzgünüz, hesap kaydı devre dışı bırakıldı.",
-        "LOGOUT"            => "Üzgünüm, oturumunuz açıkken yeni bir hesap oluşturamazsınız. Lütfen önce oturumunuzdan çıkış yapınız.",
-        "WELCOME"           => "Kaydolmak hızlı ve basittir."
+        "BROKEN" => "Üzgünüz, hesap kayıt işlemimizde bir sorun var. Lütfen destek almak için doğrudan bizimle iletişime geçin.",
+        "COMPLETE_TYPE1" => "Kaydınız başarıyla tamamlandı. Şimdi giriş yapabilirsiniz.",
+        "COMPLETE_TYPE2" => "Kaydınız başarıyla tamamlandı. Hesabınızı aktifleştirmek için bir bağlantı gönderildi<strong>{{email}}</strong>. Bu adımı tamamlayana kadar oturum açamazsınız.",
+        "DISABLED" => "Üzgünüz, hesap kaydı devre dışı bırakıldı.",
+        "LOGOUT" => "Üzgünüm, oturumunuz açıkken yeni bir hesap oluşturamazsınız. Lütfen önce oturumunuzdan çıkış yapınız.",
+        "WELCOME" => "Kaydolmak hızlı ve basittir."
     ],
-    "REMEMBER_ME"               => "Beni hatırla!",
-    "REMEMBER_ME_ON_COMPUTER"   => "Bu bilgisayarda beni hatırla ( genel bilgisayarlar için önerilmez)",
+    "REMEMBER_ME" => "Beni hatırla!",
+    "REMEMBER_ME_ON_COMPUTER" => "Bu bilgisayarda beni hatırla ( genel bilgisayarlar için önerilmez)",
 
-    "SIGN_IN_HERE"          => "Zaten bir hesaba sahip misiniz?<a href=\"{{url}}\">burada giriş yap</a>",
-    "SIGNIN"                => "Giriş yap",
-    "SIGNIN_OR_REGISTER"    => "Giriş yap veya kayıt ol",
-    "SIGNUP"                => "Üye ol",
+    "SIGN_IN_HERE" => "Zaten bir hesaba sahip misiniz?<a href=\"{{url}}\">burada giriş yap</a>",
+    "SIGNIN" => "Giriş yap",
+    "SIGNIN_OR_REGISTER" => "Giriş yap veya kayıt ol",
+    "SIGNUP" => "Üye ol",
 
-    "TOS"           => "Şartlar ve Koşullar",
+    "TOS" => "Şartlar ve Koşullar",
     "TOS_AGREEMENT" => "Bir hesap ile kaydolarak {{site_title}} sen kabul edersin <a {{link_attributes | raw}}>şartlar ve koşulları</a>.",
-    "TOS_FOR"       => "{{title}} için şartlar ve koşullar",
+    "TOS_FOR" => "{{title}} için şartlar ve koşullar",
 
     "USERNAME" => [
         "@TRANSLATION" => "Kullanıcı Adı",
 
-        "CHOOSE"        => "Benzersiz bir kullanıcı adı seç",
-        "INVALID"       => "Geçersiz kullanıcı adı",
-        "IN_USE"        => "<strong>{{user_name}}</strong> kullanıcı adı zaten mevcut.",
+        "CHOOSE" => "Benzersiz bir kullanıcı adı seç",
+        "INVALID" => "Geçersiz kullanıcı adı",
+        "IN_USE" => "<strong>{{user_name}}</strong> kullanıcı adı zaten mevcut.",
         "NOT_AVAILABLE" => "<strong>{{user_name}}</strong> kullanıcı adı kullanılamaz. Farklı bir isim veya 'öneriye' tıklayın."
     ],
 
-    "USER_ID_INVALID"       => "İstenen kullanıcı adı mevcut değil.",
+    "USER_ID_INVALID" => "İstenen kullanıcı adı mevcut değil.",
     "USER_OR_EMAIL_INVALID" => "Kullanıcı adı veya e-posta adresi hatalı.",
-    "USER_OR_PASS_INVALID"  => "Kullanıcı bulunamadı ya da şifre hatalı.",
+    "USER_OR_PASS_INVALID" => "Kullanıcı bulunamadı ya da şifre hatalı.",
 
     "WELCOME" => "Tekrar Hoşgeldiniz.{{first_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/tr/validate.php b/main/app/sprinkles/account/locale/tr/validate.php
index 298bdbc..cd4380b 100644
--- a/main/app/sprinkles/account/locale/tr/validate.php
+++ b/main/app/sprinkles/account/locale/tr/validate.php
@@ -12,7 +12,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "Şifreniz ve onaylama şifreniz eşleşmiyor.",
         "USERNAME" => "Kullanıcı adınız sadece küçük harfler, sayılar, '.', '-', ve '_' içerebilir."
     ]
diff --git a/main/app/sprinkles/account/locale/zh_CN/messages.php b/main/app/sprinkles/account/locale/zh_CN/messages.php
index 60adcf0..41c4439 100644
--- a/main/app/sprinkles/account/locale/zh_CN/messages.php
+++ b/main/app/sprinkles/account/locale/zh_CN/messages.php
@@ -24,16 +24,16 @@ return [
         "INVALID" => "此账户不存在. 可能已被删除.  请联系我们获取更多信息.",
 
         "MASTER_NOT_EXISTS" => "在创建超级账户之前你不能注册",
-        "MY"                => "我的账户",
+        "MY" => "我的账户",
 
-        "SESSION_COMPROMISED"       => "你的会话已泄露.  你应该在所有的设备上注销, 然后再登陆确保你的数据没被修改.",
+        "SESSION_COMPROMISED" => "你的会话已泄露.  你应该在所有的设备上注销, 然后再登陆确保你的数据没被修改.",
         "SESSION_COMPROMISED_TITLE" => "你的账户可能被盗用",
-        "SESSION_EXPIRED"       => "会话已过期.  请重新登陆.",
+        "SESSION_EXPIRED" => "会话已过期.  请重新登陆.",
 
         "SETTINGS" => [
-            "@TRANSLATION"  => "账户设置",
-            "DESCRIPTION"   => "更新你的账户, 包括邮箱、姓名和密码.",
-            "UPDATED"       => "账户更新成功"
+            "@TRANSLATION" => "账户设置",
+            "DESCRIPTION" => "更新你的账户, 包括邮箱、姓名和密码.",
+            "UPDATED" => "账户更新成功"
         ],
 
         "TOOLS" => "账户工具",
@@ -41,19 +41,19 @@ return [
         "UNVERIFIED" => "你的账户还没有验证. 检查你的(垃圾)邮箱文件夹进行验证.",
 
         "VERIFICATION" => [
-            "NEW_LINK_SENT"     => "我们发送了新的验证链接 {{email}}.  请检查你的收件箱或垃圾邮件进行验证.",
-            "RESEND"            => "重新发送验证邮件",
-            "COMPLETE"          => "你已成功验证. 现在可以登陆了.",
-            "EMAIL"             => "请输入你登陆时的邮箱, 然后将会发送验证邮件.",
-            "PAGE"              => "重新发送验证邮件给你的新账户.",
-            "SEND"              => "为我的账户发送验证邮件",
-            "TOKEN_NOT_FOUND"   => "验证令牌不存在 / 账户已经验证",
+            "NEW_LINK_SENT" => "我们发送了新的验证链接 {{email}}.  请检查你的收件箱或垃圾邮件进行验证.",
+            "RESEND" => "重新发送验证邮件",
+            "COMPLETE" => "你已成功验证. 现在可以登陆了.",
+            "EMAIL" => "请输入你登陆时的邮箱, 然后将会发送验证邮件.",
+            "PAGE" => "重新发送验证邮件给你的新账户.",
+            "SEND" => "为我的账户发送验证邮件",
+            "TOKEN_NOT_FOUND" => "验证令牌不存在 / 账户已经验证",
         ]
     ],
 
     "EMAIL" => [
-        "INVALID"               => "<strong>{{email}}</strong> 没有账户注册.",
-        "IN_USE"                => "邮箱 <strong>{{email}}</strong> 已被使用.",
+        "INVALID" => "<strong>{{email}}</strong> 没有账户注册.",
+        "IN_USE" => "邮箱 <strong>{{email}}</strong> 已被使用.",
         "VERIFICATION_REQUIRED" => "邮箱 (需要进行验证 - 请使用一个有效的!)"
     ],
 
@@ -71,10 +71,10 @@ return [
     ],
 
     "LOGIN" => [
-        "@TRANSLATION"      => "登陆",
-        "ALREADY_COMPLETE"  => "你已经登陆!",
-        "SOCIAL"            => "用其他方式登陆",
-        "REQUIRED"          => "对不起, 你需要登陆才能获取资源."
+        "@TRANSLATION" => "登陆",
+        "ALREADY_COMPLETE" => "你已经登陆!",
+        "SOCIAL" => "用其他方式登陆",
+        "REQUIRED" => "对不起, 你需要登陆才能获取资源."
     ],
 
     "LOGOUT" => "注销",
@@ -85,93 +85,93 @@ return [
 
     "PAGE" => [
         "LOGIN" => [
-            "DESCRIPTION"   => "用 {{site_name}} 账户登陆, 或者创建新账户.",
-            "SUBTITLE"      => "免费注册, 或用已有账户登陆.",
-            "TITLE"         => "让我们开始吧!",
+            "DESCRIPTION" => "用 {{site_name}} 账户登陆, 或者创建新账户.",
+            "SUBTITLE" => "免费注册, 或用已有账户登陆.",
+            "TITLE" => "让我们开始吧!",
         ]
     ],
 
     "PASSWORD" => [
         "@TRANSLATION" => "密码",
 
-        "BETWEEN"   => "字符长度 {{min}}-{{max}} ",
+        "BETWEEN" => "字符长度 {{min}}-{{max}} ",
 
-        "CONFIRM"               => "确认密码",
-        "CONFIRM_CURRENT"       => "请确认当前密码",
-        "CONFIRM_NEW"           => "确认新密码",
-        "CONFIRM_NEW_EXPLAIN"   => "重新输入新密码",
-        "CONFIRM_NEW_HELP"      => "选择了新密码时才需要",
-        "CURRENT"               => "密码正确",
-        "CURRENT_EXPLAIN"       => "你必须要确认密码再进行修改",
+        "CONFIRM" => "确认密码",
+        "CONFIRM_CURRENT" => "请确认当前密码",
+        "CONFIRM_NEW" => "确认新密码",
+        "CONFIRM_NEW_EXPLAIN" => "重新输入新密码",
+        "CONFIRM_NEW_HELP" => "选择了新密码时才需要",
+        "CURRENT" => "密码正确",
+        "CURRENT_EXPLAIN" => "你必须要确认密码再进行修改",
 
         "FORGOTTEN" => "忘记密码",
         "FORGET" => [
             "@TRANSLATION" => "我忘记了密码",
 
-            "COULD_NOT_UPDATE"  => "无法更新密码.",
-            "EMAIL"             => "请输入你登陆时的邮箱. 重置密码的链接将会发送给你.",
-            "EMAIL_SEND"        => "发送重置密码链接",
-            "INVALID"           => "这个重置密码请求无法使用, 或已过期.  请 <a href=\"{{url}}\">重新发送请求<a>.",
-            "PAGE"              => "获取重置密码的链接.",
-            "REQUEST_CANNED"    => "取消重置请求.",
-            "REQUEST_SENT"      => "重置密码的链接已经发送 <strong>{{email}}</strong>."
+            "COULD_NOT_UPDATE" => "无法更新密码.",
+            "EMAIL" => "请输入你登陆时的邮箱. 重置密码的链接将会发送给你.",
+            "EMAIL_SEND" => "发送重置密码链接",
+            "INVALID" => "这个重置密码请求无法使用, 或已过期.  请 <a href=\"{{url}}\">重新发送请求<a>.",
+            "PAGE" => "获取重置密码的链接.",
+            "REQUEST_CANNED" => "取消重置请求.",
+            "REQUEST_SENT" => "重置密码的链接已经发送 <strong>{{email}}</strong>."
         ],
 
         "RESET" => [
-            "@TRANSLATION"      => "重置密码",
-            "CHOOSE"            => "请输入新密码.",
-            "PAGE"              => "为账户设置新密码.",
-            "SEND"              => "设置密码并登陆"
+            "@TRANSLATION" => "重置密码",
+            "CHOOSE" => "请输入新密码.",
+            "PAGE" => "为账户设置新密码.",
+            "SEND" => "设置密码并登陆"
         ],
 
-        "HASH_FAILED"       => "密码验证失败. 请联系网站管理.",
-        "INVALID"           => "当前密码无法与记录匹配",
-        "NEW"               => "新密码",
+        "HASH_FAILED" => "密码验证失败. 请联系网站管理.",
+        "INVALID" => "当前密码无法与记录匹配",
+        "NEW" => "新密码",
         "NOTHING_TO_UPDATE" => "新密码不能与旧密码相同",
-        "UPDATED"           => "账户密码更新成功"
+        "UPDATED" => "账户密码更新成功"
     ],
 
-    "PROFILE"       => [
-        "SETTINGS"  => "简介设置",
-        "UPDATED"   => "简介设置成功"
+    "PROFILE" => [
+        "SETTINGS" => "简介设置",
+        "UPDATED" => "简介设置成功"
     ],
 
-    "REGISTER"      => "注册",
-    "REGISTER_ME"   => "注册",
+    "REGISTER" => "注册",
+    "REGISTER_ME" => "注册",
 
     "REGISTRATION" => [
-        "BROKEN"            => "抱歉, 账户注册过程发送错误.  请联系我们寻求帮助.",
-        "COMPLETE_TYPE1"    => "你已注册成功. 现在可以登陆了.",
-        "COMPLETE_TYPE2"    => "成功注册. 激活链接已经发送给 <strong>{{email}}</strong>.  激活之前无法登陆.",
-        "DISABLED"          => "抱歉, 账户注册以禁用.",
-        "LOGOUT"            => "抱歉, 登陆时不能注册. 请先注销.",
-        "WELCOME"           => "注册简单快速."
+        "BROKEN" => "抱歉, 账户注册过程发送错误.  请联系我们寻求帮助.",
+        "COMPLETE_TYPE1" => "你已注册成功. 现在可以登陆了.",
+        "COMPLETE_TYPE2" => "成功注册. 激活链接已经发送给 <strong>{{email}}</strong>.  激活之前无法登陆.",
+        "DISABLED" => "抱歉, 账户注册以禁用.",
+        "LOGOUT" => "抱歉, 登陆时不能注册. 请先注销.",
+        "WELCOME" => "注册简单快速."
     ],
 
-    "RATE_LIMIT_EXCEEDED"       => "行动速度过快.  请等 {{delay}} 秒后再尝试新的操作.",
-    "REMEMBER_ME"               => "记住我!",
-    "REMEMBER_ME_ON_COMPUTER"   => "在此电脑上记住我 (不推荐在公共电脑上)",
+    "RATE_LIMIT_EXCEEDED" => "行动速度过快.  请等 {{delay}} 秒后再尝试新的操作.",
+    "REMEMBER_ME" => "记住我!",
+    "REMEMBER_ME_ON_COMPUTER" => "在此电脑上记住我 (不推荐在公共电脑上)",
 
-    "SIGNIN"                => "登陆",
-    "SIGNIN_OR_REGISTER"    => "登陆或注册",
-    "SIGNUP"                => "注销",
+    "SIGNIN" => "登陆",
+    "SIGNIN_OR_REGISTER" => "登陆或注册",
+    "SIGNUP" => "注销",
 
-    "TOS"           => "条款和说明",
+    "TOS" => "条款和说明",
     "TOS_AGREEMENT" => "在 {{site_title}} 注册, 你需要接收 <a {{link_attributes | raw}}>条款和说明</a>.",
-    "TOS_FOR"       => "{{title}}的条款和说明",
+    "TOS_FOR" => "{{title}}的条款和说明",
 
     "USERNAME" => [
         "@TRANSLATION" => "用户名",
 
-        "CHOOSE"        => "取一个唯一的用户名",
-        "INVALID"       => "无效的用户名",
-        "IN_USE"        => "用户名 <strong>{{user_name}}</strong> 已存在.",
+        "CHOOSE" => "取一个唯一的用户名",
+        "INVALID" => "无效的用户名",
+        "IN_USE" => "用户名 <strong>{{user_name}}</strong> 已存在.",
         "NOT_AVAILABLE" => "用户名 <strong>{{user_name}}</strong> 不可用. 重新选择用户名, 或者点击 '建议'."
     ],
 
-    "USER_ID_INVALID"       => "请求的用户不存在.",
+    "USER_ID_INVALID" => "请求的用户不存在.",
     "USER_OR_EMAIL_INVALID" => "用户名或邮箱无效.",
-    "USER_OR_PASS_INVALID"  => "没有发现用户或密码错误.",
+    "USER_OR_PASS_INVALID" => "没有发现用户或密码错误.",
 
     "WELCOME" => "欢迎回来, {{first_name}}"
 ];
diff --git a/main/app/sprinkles/account/locale/zh_CN/validate.php b/main/app/sprinkles/account/locale/zh_CN/validate.php
index 3ca368a..db58c06 100644
--- a/main/app/sprinkles/account/locale/zh_CN/validate.php
+++ b/main/app/sprinkles/account/locale/zh_CN/validate.php
@@ -12,7 +12,7 @@
  */
 
 return [
-	"VALIDATE" => [
+    "VALIDATE" => [
         "PASSWORD_MISMATCH" => "密码不一致.",
         "USERNAME" => "用户名必须以小写字母, 数字, '.', '-', 和 '_'组成."
     ]