diff --git a/README.md b/README.md
index 6113f9dd0..7b57cd430 100644
--- a/README.md
+++ b/README.md
@@ -39,16 +39,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    compile 'com.firebaseui:firebase-ui-database:3.0.0'
+    compile 'com.firebaseui:firebase-ui-database:3.1.0'
     
     // FirebaseUI for Cloud Firestore
-    compile 'com.firebaseui:firebase-ui-firestore:3.0.0'
+    compile 'com.firebaseui:firebase-ui-firestore:3.1.0'
 
     // FirebaseUI for Firebase Auth
-    compile 'com.firebaseui:firebase-ui-auth:3.0.0'
+    compile 'com.firebaseui:firebase-ui-auth:3.1.0'
 
     // FirebaseUI for Cloud Storage
-    compile 'com.firebaseui:firebase-ui-storage:3.0.0'
+    compile 'com.firebaseui:firebase-ui-storage:3.1.0'
 }
 ```
 
@@ -95,6 +95,7 @@ For convenience, here are some recent examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
+| 3.1.0              | 11.4.2                         |
 | 3.0.0              | 11.4.2                         |
 | 2.4.0              | 11.4.0                         |
 | 2.3.0              | 11.0.4                         |
diff --git a/auth/README.md b/auth/README.md
index 7f9e46aba..4885fcaf1 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -46,7 +46,7 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    compile 'com.firebaseui:firebase-ui-auth:3.0.0'
+    compile 'com.firebaseui:firebase-ui-auth:3.1.0'
 
     // Required only if Facebook login support is required
     compile 'com.facebook.android:facebook-login:4.27.0'
diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
index d553703a0..017369b4a 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -146,6 +146,8 @@ public class AuthUI {
     private AuthUI(FirebaseApp app) {
         mApp = app;
         mAuth = FirebaseAuth.getInstance(mApp);
+
+        mAuth.useAppLanguage();
     }
 
     /**
diff --git a/auth/src/main/res/values-ar/strings.xml b/auth/src/main/res/values-ar/strings.xml
new file mode 100755
index 000000000..7d82d733c
--- /dev/null
+++ b/auth/src/main/res/values-ar/strings.xml
@@ -0,0 +1,71 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="fui_progress_dialog_loading" translation_description="Loading text in dialog">جارٍ التحميل…</string>
+    <string name="fui_sign_in_default" translation_description="Button text to sign in">تسجيل الدخول</string>
+    <string name="fui_general_error" translation_description="Toast text flashing general error">حدث خطأ.</string>
+    <string name="fui_idp_name_google">Google</string>
+    <string name="fui_idp_name_facebook">Facebook</string>
+    <string name="fui_idp_name_twitter">Twitter</string>
+    <string name="fui_provider_name_email">البريد الإلكتروني</string>
+    <string name="fui_provider_name_phone">الهاتف</string>
+    <string name="fui_sign_in_with_google" translation_description="Sign in button text">تسجيل الدخول عبر Google</string>
+    <string name="fui_sign_in_with_facebook" translation_description="Sign in button text">تسجيل الدخول عبر Facebook</string>
+    <string name="fui_sign_in_with_twitter" translation_description="Sign in button text">تسجيل الدخول عبر Twitter</string>
+    <string name="fui_sign_in_with_email" translation_description="Sign in button text">تسجيل الدخول عبر البريد الإلكتروني</string>
+    <string name="fui_sign_in_with_phone" translation_description="Sign in button text">تسجيل الدخول عبر رقم الهاتف</string>
+    <string name="fui_next_default" translation_description="Button text to continue">التالي</string>
+    <string name="fui_email_hint" translation_description="Hint in email input field">البريد الإلكتروني</string>
+    <string name="fui_phone_hint" translation_description="Hint for phone input field">رقم الهاتف</string>
+    <string name="fui_password_hint" translation_description="Hint for password input field">كلمة المرور</string>
+    <string name="fui_required_field" translation_description="Inline error for required field">يجب ملء هذا الحقل.</string>
+    <string name="fui_invalid_email_address" translation_description="Inline error for invalid email address">عنوان البريد الإلكتروني هذا غير صحيح</string>
+    <string name="fui_missing_email_address" translation_description="Inline error for empty email address in input field">يجب إدخال عنوان بريدك الإلكتروني للمتابعة</string>
+    <string name="fui_progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">جارٍ البحث عن حسابات حالية…</string>
+    <string name="fui_title_register_email" translation_description="Title for signup form">اشتراك</string>
+    <string name="fui_name_hint" translation_description="Hint for last name input field">الاسم الأول واسم العائلة</string>
+    <string name="fui_button_text_save" translation_description="Button text to save input form">حفظ</string>
+    <string name="fui_progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">جارٍ الاشتراك…</string>
+    <plurals name="fui_error_weak_password" translation_description="Inline error for weak password"> <item quantity="zero">كلمة المرور ليست قوية بما فيه الكفاية. يجب استخدام %1$d رقم على الأقل ومزيج من الأحرف والأرقام</item> <item quantity="one">كلمة المرور ليست قوية بما فيه الكفاية. يجب استخدام رقم واحد (%1$d) على الأقل ومزيج من الأحرف والأرقام</item> <item quantity="two">كلمة المرور ليست قوية بما فيه الكفاية. يجب استخدام رقمين (%1$d) على الأقل ومزيج من الأحرف والأرقام</item> <item quantity="few">كلمة المرور ليست قوية بما فيه الكفاية. يجب استخدام %1$d أرقام على الأقل ومزيج من الأحرف والأرقام</item> <item quantity="many">كلمة المرور ليست قوية بما فيه الكفاية. يجب استخدام %1$d رقمًا على الأقل ومزيج من الأحرف والأرقام</item> <item quantity="other">كلمة المرور ليست قوية بما فيه الكفاية. يجب استخدام %1$d رقم على الأقل ومزيج من الأحرف والأرقام</item> </plurals>
+    <string name="fui_email_account_creation_error" translation_description="Inline error for signup failure">فشل تسجيل حساب البريد الإلكتروني</string>
+    <string name="fui_error_user_collision" translation_description="Inline error when user signs up using an existing email account">ثمة حساب يستخدم عنوان البريد الإلكتروني هذا.</string>
+    <string name="fui_create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">يُعد النقر على %1$s دليلاً على أنك توافق على %2$s و%3$s.</string>
+    <string name="fui_create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">يُعد النقر على %1$s دليلاً على أنك توافق على %2$s.</string>
+    <string name="fui_create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">يُعد النقر على %1$s دليلاً على أنك توافق على %2$s.</string>
+    <string name="fui_terms_of_service" translation_description="Link text to web url containing the app's terms of service">بنود الخدمة</string>
+    <string name="fui_privacy_policy" translation_description="Link text to web url containing the app's privacy policy">سياسة الخصوصية</string>
+    <string name="fui_welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">لديك حساب حاليًا</string>
+    <string name="fui_welcome_back_email_header" translation_description="Message for returning users">تسرّنا عودتك!</string>
+    <string name="fui_welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">لقد سبق أن استخدمت %1$s. سجّل الدخول باستخدام %2$s للمتابعة.</string>
+    <string name="fui_welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">لقد سبق أن استخدمت %1$s لتسجيل الدخول. يُرجى إدخال كلمة المرور لهذا الحساب.</string>
+    <string name="fui_progress_dialog_signing_in" translation_description="Progress dialog text">جارٍ تسجيل الدخول…</string>
+    <string name="fui_trouble_signing_in" translation_description="Link leading to forgot password flow">هل تواجه مشكلة في تسجيل الدخول؟</string>
+    <string name="fui_title_recover_password_activity" translation_description="Recover password screen title">استرداد كلمة المرور</string>
+    <string name="fui_title_confirm_recover_password" translation_description="Password recovery confirmation message">إثبات ملكية بريدك الإلكتروني</string>
+    <string name="fui_password_recovery_body" translation_description="Password recovery message body">تم إرسال تعليمات إلى البريد الإلكتروني هذا تشرح كيفية إعادة تعيين كلمة المرور.</string>
+    <string name="fui_button_text_send" translation_description="Button text to send recovery email">إرسال</string>
+    <string name="fui_confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">اتبع التعليمات التي تم إرسالها إلى %1$s لاسترداد كلمة المرور.</string>
+    <string name="fui_progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">جارٍ الإرسال…</string>
+    <string name="fui_error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">لا يتطابق عنوان البريد الإلكتروني هذا مع حساب حالي</string>
+    <string name="fui_accessibility_logo" translation_description="Content description for app logo">شعار التطبيق</string>
+    <string name="fui_signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">تم تسجيل الدخول من حساب %1$s</string>
+    <string name="fui_verify_phone_number_title" translation_description="Phone number entry form title">أدخل رقم هاتفك</string>
+    <string name="fui_invalid_phone_number" translation_description="Inline error when phone number entered is invalid">يُرجى إدخال رقم هاتف صالح</string>
+    <string name="fui_enter_confirmation_code" translation_description="Phone number verification code entry form title">أدخل الرمز المكوّن من 6 أرقام الذي أرسلناه إلى</string>
+    <string name="fui_resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">إعادة إرسال الرمز بعد 0:%02d</string>
+    <string name="fui_verify_your_phone_title" translation_description="Button text to complete phone number verification">إثبات ملكية رقم هاتفك</string>
+    <string name="fui_verifying" translation_description="Progress dialog text while phone number is being verified">جارٍ إثبات الملكية…</string>
+    <string name="fui_retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">جارٍ استرداد الرسائل القصيرة SMS…</string>
+    <string name="fui_incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">الرمز غير صحيح. يُرجى المحاولة مجددًا.</string>
+    <string name="fui_incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">موافق</string>
+    <string name="fui_error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">تم استخدام رقم الهاتف هذا لعدد كبير جدًا من المرات</string>
+    <string name="fui_error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">حدثت مشكلة أثناء إثبات ملكية رقم هاتفك</string>
+    <string name="fui_error_session_expired" translation_description="Error message when SMS confirmation code has expired.">لم يعد هذا الرمز صالحًا</string>
+    <string name="fui_sign_in_with_phone_number" translation_description="Label for phone number input form">تسجيل الدخول عبر رقم الهاتف</string>
+    <string name="fui_done" translation_description="Progress dialog success transition once sms is sent">تم</string>
+    <string name="fui_verified" translation_description="Progress dialog success transition when phone number was verified">اكتملت عملية إثبات الملكية!</string>
+    <string name="fui_code_sent" translation_description="Progress dialog success transition once sms is sent">تم إرسال الرمز!</string>
+    <string name="fui_resending" translation_description="Progress dialog text when user clicks on resend sms">جارٍ إعادة الإرسال…</string>
+    <string name="fui_resend_code" translation_description="Link text to resend verification sms">إعادة إرسال الرمز</string>
+    <string name="fui_verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">تأكيد ملكية رقم الهاتف</string>
+    <string name="fui_continue_phone_login" translation_description="Button text to submit phone number and send sms">متابعة</string>
+    <string name="fui_sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">قد يتم إرسال رسالة قصيرة SMS من خلال النقر على “%1$s”. وقد يتم تطبيق رسوم الرسائل والبيانات.</string>
+</resources>
diff --git a/auth/src/main/res/values-iw/strings.xml b/auth/src/main/res/values-iw/strings.xml
new file mode 100755
index 000000000..510752f64
--- /dev/null
+++ b/auth/src/main/res/values-iw/strings.xml
@@ -0,0 +1,71 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="fui_progress_dialog_loading" translation_description="Loading text in dialog">טוען…</string>
+    <string name="fui_sign_in_default" translation_description="Button text to sign in">כניסה</string>
+    <string name="fui_general_error" translation_description="Toast text flashing general error">אירעה שגיאה.</string>
+    <string name="fui_idp_name_google">Google</string>
+    <string name="fui_idp_name_facebook">Facebook</string>
+    <string name="fui_idp_name_twitter">Twitter</string>
+    <string name="fui_provider_name_email">אימייל</string>
+    <string name="fui_provider_name_phone">טלפון</string>
+    <string name="fui_sign_in_with_google" translation_description="Sign in button text">כניסה באמצעות Google</string>
+    <string name="fui_sign_in_with_facebook" translation_description="Sign in button text">כניסה באמצעות Facebook</string>
+    <string name="fui_sign_in_with_twitter" translation_description="Sign in button text">כניסה באמצעות Twitter</string>
+    <string name="fui_sign_in_with_email" translation_description="Sign in button text">כניסה באמצעות אימייל</string>
+    <string name="fui_sign_in_with_phone" translation_description="Sign in button text">כניסה באמצעות הטלפון</string>
+    <string name="fui_next_default" translation_description="Button text to continue">הבא‏</string>
+    <string name="fui_email_hint" translation_description="Hint in email input field">אימייל</string>
+    <string name="fui_phone_hint" translation_description="Hint for phone input field">מספר טלפון</string>
+    <string name="fui_password_hint" translation_description="Hint for password input field">סיסמה</string>
+    <string name="fui_required_field" translation_description="Inline error for required field">אי אפשר להשאיר את השדה הזה ריק.</string>
+    <string name="fui_invalid_email_address" translation_description="Inline error for invalid email address">כתובת האימייל שגויה</string>
+    <string name="fui_missing_email_address" translation_description="Inline error for empty email address in input field">כדי להמשיך, עליך להזין כתובת אימייל</string>
+    <string name="fui_progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">מחפש חשבונות קיימים…</string>
+    <string name="fui_title_register_email" translation_description="Title for signup form">הרשמה</string>
+    <string name="fui_name_hint" translation_description="Hint for last name input field">שם מלא</string>
+    <string name="fui_button_text_save" translation_description="Button text to save input form">שמור</string>
+    <string name="fui_progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">אנחנו רושמים אותך…</string>
+    <plurals name="fui_error_weak_password" translation_description="Inline error for weak password"> <item quantity="one">הסיסמה חלשה מדי. סיסמה חזקה היא סיסמה באורך תו אחד (%1$d) לפחות שמכילה אותיות ומספרים</item> <item quantity="two">הסיסמה חלשה מדי. סיסמה חזקה היא סיסמה באורך %1$d תווים לפחות שמכילה אותיות ומספרים</item> <item quantity="many">הסיסמה חלשה מדי. סיסמה חזקה היא סיסמה באורך %1$d תווים לפחות שמכילה אותיות ומספרים</item> <item quantity="other">הסיסמה חלשה מדי. סיסמה חזקה היא סיסמה באורך %1$d תווים לפחות שמכילה אותיות ומספרים</item> </plurals>
+    <string name="fui_email_account_creation_error" translation_description="Inline error for signup failure">לא הצלחנו להשלים את הרישום לחשבון באמצעות כתובת האימייל</string>
+    <string name="fui_error_user_collision" translation_description="Inline error when user signs up using an existing email account">כבר קיים חשבון המשויך לכתובת האימייל הזו.</string>
+    <string name="fui_create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">הקשה על %1$s תתפרש כהסכמה ל%2$s ול%3$s.</string>
+    <string name="fui_create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">הקשה על %1$s תתפרש כהסכמה ל%2$s.</string>
+    <string name="fui_create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">הקשה על %1$s תתפרש כהסכמה ל%2$s.</string>
+    <string name="fui_terms_of_service" translation_description="Link text to web url containing the app's terms of service">תנאים והגבלות</string>
+    <string name="fui_privacy_policy" translation_description="Link text to web url containing the app's privacy policy">מדיניות הפרטיות</string>
+    <string name="fui_welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">כבר יש לך חשבון</string>
+    <string name="fui_welcome_back_email_header" translation_description="Message for returning users">ברוכים השבים!</string>
+    <string name="fui_welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">כבר השתמשת בכתובת %1$s. כדי להמשיך, עליך להיכנס באמצעות %2$s.</string>
+    <string name="fui_welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">כבר השתמשת בכתובת %1$s. כדי להיכנס. עליך להזין את הסיסמה לחשבון המשויך אליה.</string>
+    <string name="fui_progress_dialog_signing_in" translation_description="Progress dialog text">נכנס…</string>
+    <string name="fui_trouble_signing_in" translation_description="Link leading to forgot password flow">לא מצליח להיכנס?</string>
+    <string name="fui_title_recover_password_activity" translation_description="Recover password screen title">שחזור הסיסמה</string>
+    <string name="fui_title_confirm_recover_password" translation_description="Password recovery confirmation message">שלחנו לך אימייל</string>
+    <string name="fui_password_recovery_body" translation_description="Password recovery message body">אנחנו יכולים לשלוח לכתובת הזו הוראות לאיפוס הסיסמה.</string>
+    <string name="fui_button_text_send" translation_description="Button text to send recovery email">שלח</string>
+    <string name="fui_confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">כדי לשחזר את הסיסמה, עליך לפעול לפי ההוראות ששלחנו לכתובת %1$s.</string>
+    <string name="fui_progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">מתבצעת שליחה…</string>
+    <string name="fui_error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">אין חשבון המשויך לכתובת האימייל הזו</string>
+    <string name="fui_accessibility_logo" translation_description="Content description for app logo">הלוגו של האפליקציה</string>
+    <string name="fui_signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">מחובר כ-%1$s</string>
+    <string name="fui_verify_phone_number_title" translation_description="Phone number entry form title">הזן את מספר הטלפון שלך</string>
+    <string name="fui_invalid_phone_number" translation_description="Inline error when phone number entered is invalid">מספר הטלפון שהזנת לא תקין</string>
+    <string name="fui_enter_confirmation_code" translation_description="Phone number verification code entry form title">הזן את הקוד בן 6 הספרות ששלחנו אל</string>
+    <string name="fui_resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">שולח קוד חדש בעוד %02d:0</string>
+    <string name="fui_verify_your_phone_title" translation_description="Button text to complete phone number verification">אמת את מספר הטלפון</string>
+    <string name="fui_verifying" translation_description="Progress dialog text while phone number is being verified">מאמת…</string>
+    <string name="fui_retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">מאחזר SMS…</string>
+    <string name="fui_incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">הקוד שגוי. נסה שוב.</string>
+    <string name="fui_incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">אישור</string>
+    <string name="fui_error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">למספר הטלפון הזה כבר נשלחו יותר מדי קודים</string>
+    <string name="fui_error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">אירעה בעיה באימות של מספר הטלפון</string>
+    <string name="fui_error_session_expired" translation_description="Error message when SMS confirmation code has expired.">הקוד הזה כבר לא בתוקף</string>
+    <string name="fui_sign_in_with_phone_number" translation_description="Label for phone number input form">כניסה באמצעות מספר טלפון</string>
+    <string name="fui_done" translation_description="Progress dialog success transition once sms is sent">סיום</string>
+    <string name="fui_verified" translation_description="Progress dialog success transition when phone number was verified">אומת.</string>
+    <string name="fui_code_sent" translation_description="Progress dialog success transition once sms is sent">הקוד נשלח.</string>
+    <string name="fui_resending" translation_description="Progress dialog text when user clicks on resend sms">שולח קוד חדש…</string>
+    <string name="fui_resend_code" translation_description="Link text to resend verification sms">שלח קוד חדש</string>
+    <string name="fui_verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">אמת את מספר הטלפון</string>
+    <string name="fui_continue_phone_login" translation_description="Button text to submit phone number and send sms">המשך</string>
+    <string name="fui_sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">הקשה על “%1$s” תגרום לשליחה של הודעת SMS. ייתכנו חיובים על ההודעה ועל נתונים.</string>
+</resources>
diff --git a/auth/src/main/res/values-nl/strings.xml b/auth/src/main/res/values-nl/strings.xml
index 6be8c5729..684a21dc1 100755
--- a/auth/src/main/res/values-nl/strings.xml
+++ b/auth/src/main/res/values-nl/strings.xml
@@ -67,5 +67,5 @@
     <string name="fui_resend_code" translation_description="Link text to resend verification sms">Code opnieuw verzenden</string>
     <string name="fui_verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefoonnummer verifiëren</string>
     <string name="fui_continue_phone_login" translation_description="Button text to submit phone number and send sms">Doorgaan</string>
-    <string name="fui_sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Als u op “%1$s”, ontvangt u mogelijk een sms. Er kunnen sms- en datakosten in rekening worden gebracht.</string>
+    <string name="fui_sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Als u op “%1$s” tikt, ontvangt u mogelijk een sms. Er kunnen sms- en datakosten in rekening worden gebracht.</string>
 </resources>
diff --git a/auth/src/main/res/values-sw360dp/dimens.xml b/auth/src/main/res/values-sw360dp/dimens.xml
old mode 100644
new mode 100755
diff --git a/auth/src/main/res/values-tr/strings.xml b/auth/src/main/res/values-tr/strings.xml
index 5b24a3743..7c21546e2 100755
--- a/auth/src/main/res/values-tr/strings.xml
+++ b/auth/src/main/res/values-tr/strings.xml
@@ -16,7 +16,7 @@
     <string name="fui_email_hint" translation_description="Hint in email input field">E-posta</string>
     <string name="fui_phone_hint" translation_description="Hint for phone input field">Telefon Numarası</string>
     <string name="fui_password_hint" translation_description="Hint for password input field">Şifre</string>
-    <string name="fui_required_field" translation_description="Inline error for required field">Bunu boş bırakamazsınız.</string>
+    <string name="fui_required_field" translation_description="Inline error for required field">Bu alanı boş bırakamazsınız.</string>
     <string name="fui_invalid_email_address" translation_description="Inline error for invalid email address">E-posta adresi doğru değil</string>
     <string name="fui_missing_email_address" translation_description="Inline error for empty email address in input field">Devam etmek için e-posta adresinizi girin</string>
     <string name="fui_progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Mevcut hesaplar kontrol ediliyor…</string>
diff --git a/auth/src/main/res/values-v26/styles.xml b/auth/src/main/res/values-v26/styles.xml
old mode 100644
new mode 100755
diff --git a/constants.gradle b/constants.gradle
index 60e56ce9d..c69b849e6 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -1,7 +1,7 @@
 project.ext {
     submodules = ['database', 'auth', 'storage', 'firestore', 'common']
     group = 'com.firebaseui'
-    version = '3.0.0'
+    version = '3.1.0'
     pomdesc = 'Firebase UI Android'
 
     compileSdk = 26
diff --git a/scripts/translations/clean_up_translations.sh b/scripts/translations/clean_up_translations.sh
index 833cc622a..204a96f4b 100755
--- a/scripts/translations/clean_up_translations.sh
+++ b/scripts/translations/clean_up_translations.sh
@@ -13,12 +13,6 @@ function find_files {
 chmod -R +wx auth/src/main/res/values-*
 rm -rf auth/src/main/res/values-{he,id}
 
-# Remove all RTL locales (until we fully QA them)
-# [Arabic and Hebrew]
-rm -rf auth/src/main/res/values-ar
-rm -rf auth/src/main/res/values-he
-rm -rf auth/src/main/res/values-iw
-
 # Process each file
 find_files | while read file;
 do
diff --git a/scripts/translations/fix_typography.py b/scripts/translations/fix_typography.py
index 92626f23b..19d2ea834 100644
--- a/scripts/translations/fix_typography.py
+++ b/scripts/translations/fix_typography.py
@@ -10,6 +10,7 @@
 BAD_ELLIPSIS_SPACING = " …"
 GOOD_ELLIPSIS_SPACING = "…"
 
+BAD_SINGLE_QUOTE = "\\\'%1$s\\\'"
 BAD_DOUBLE_QUOTE = "\\\"%1$s\\\""
 GOOD_DOUBLE_QUOTE = "“%1$s”"
 
@@ -20,7 +21,8 @@ def ProcessTag(self, oldLine, type):
         lineString = ''.join(oldLine) \
             .replace(BAD_ELLIPSIS, GOOD_ELLIPSIS) \
             .replace(BAD_ELLIPSIS_SPACING, GOOD_ELLIPSIS_SPACING) \
-            .replace(BAD_DOUBLE_QUOTE, GOOD_DOUBLE_QUOTE)
+            .replace(BAD_DOUBLE_QUOTE, GOOD_DOUBLE_QUOTE) \
+            .replace(BAD_SINGLE_QUOTE, GOOD_DOUBLE_QUOTE)
         newLine = lineString.split("(?!^)")
 
         minimizedWhitespaceLine = []